Michael Niedermayer 0d83b5722e Merge commit '9cacdabd1c8cd257a942d8289349c37d992989b7' ...

* commit '9cacdabd1c8cd257a942d8289349c37d992989b7':
  jpegls: cosmetics: Drop some unnecessary parentheses
  mpegvideo: Remove commented-out PARANOID debug cruft

Conflicts:
	libavcodec/jpegls.c
	libavcodec/mpegvideo.c
	libavcodec/x86/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-05-16 09:19:11 +02:00

..

ac3dsp_init.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

ac3dsp.asm

…

cabac.h

…

cavsdsp.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

constants.c

Merge commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57'

2013-05-09 11:36:29 +02:00

constants.h

Merge commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57'

2013-05-09 11:36:29 +02:00

dct32.asm

…

deinterlace.asm

…

dirac_dwt.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

dirac_dwt.h

…

diracdsp_mmx.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

diracdsp_mmx.h

…

diracdsp_yasm.asm

…

dnxhdenc.c

…

dsputil_init.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

dsputil_mmx.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

dsputil_qns_template.c

…

dsputil_x86.h

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

dsputil.asm

…

dsputilenc_mmx.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

dsputilenc.asm

…

dwt_yasm.asm

…

fdct.c

…

fft_init.c

…

fft.asm

…

fft.h

…

fmtconvert_init.c

…

fmtconvert.asm

…

fpel_mmx.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

fpel.asm

…

h263_loopfilter.asm

…

h264_chromamc_10bit.asm

…

h264_chromamc.asm

…

h264_deblock_10bit.asm

…

h264_deblock.asm

…

h264_i386.h

…

h264_idct_10bit.asm

…

h264_idct.asm

…

h264_intrapred_10bit.asm

…

h264_intrapred_init.c

…

h264_intrapred.asm

…

h264_qpel_8bit.asm

…

h264_qpel_10bit.asm

…

h264_qpel.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

h264_weight_10bit.asm

…

h264_weight.asm

…

h264chroma_init.c

Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'

2013-05-05 11:34:29 +02:00

h264dsp_init.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

hpeldsp_init.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

hpeldsp_mmx.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

hpeldsp_rnd_template.c

Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be'

2013-05-14 10:18:46 +02:00

hpeldsp.asm

…

idct_mmx_xvid.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

idct_sse2_xvid.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

idct_xvid.h

…

imdct36.asm

…

lpc.c

Merge commit '87614667606b42476f9017d79faf12b45a0bd77c'

2013-05-09 11:01:14 +02:00

Makefile

Merge commit '245b76a108585b6fb52eebc2626c472d6fa530dc'

2013-05-14 11:19:20 +02:00

mathops.h

Merge commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199'

2013-05-13 11:29:40 +02:00

mlpdsp.c

…

motion_est.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

mpeg4qpel.asm

…

mpegaudiodsp.c

…

mpegvideo.c

Merge commit '9cacdabd1c8cd257a942d8289349c37d992989b7'

2013-05-16 09:19:11 +02:00

mpegvideoenc_template.c

…

mpegvideoenc.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

pngdsp_init.c

…

pngdsp.asm

…

proresdsp_init.c

Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'

2013-05-05 11:34:29 +02:00

proresdsp.asm

…

qpel.asm

…

rnd_mmx.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

rnd_template.c

Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be'

2013-05-14 10:18:46 +02:00

rv34dsp_init.c

…

rv34dsp.asm

…

rv40dsp_init.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

rv40dsp.asm

…

sbrdsp_init.c

x86: sbrdsp: implement SSE2 qmf_pre_shuffle

2013-05-10 09:31:27 +02:00

sbrdsp.asm

Merge commit '2c299d4165cd9653153e12270971c2368551b79e'

2013-05-10 23:16:09 +02:00

simple_idct.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

snowdsp.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

v210-init.c

…

v210.asm

…

vc1dsp_init.c

x86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h

2013-05-12 22:28:07 +02:00

vc1dsp_mmx.c

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

2013-05-14 12:12:20 +02:00

vc1dsp.asm

…

vc1dsp.h

…

videodsp_init.c

…

videodsp.asm

…

vorbisdsp_init.c

…

vorbisdsp.asm

…

vp3dsp_init.c

…

vp3dsp.asm

…

vp8dsp_init.c

…

vp8dsp.asm

…

vp56_arith.h

…

vp56dsp_init.c

…

vp56dsp.asm

…

w64xmmtest.c

…