Michael Niedermayer fb61ed1e9f Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f' ... * commit 'ac4b32df71bd932838043a4838b86d11e169707f': On2 VP7 decoder Conflicts: Changelog libavcodec/arm/h264pred_init_arm.c libavcodec/arm/vp8dsp.h libavcodec/arm/vp8dsp_init_arm.c libavcodec/arm/vp8dsp_init_armv6.c libavcodec/arm/vp8dsp_init_neon.c libavcodec/avcodec.h libavcodec/h264pred.c libavcodec/version.h libavcodec/vp8.c libavcodec/vp8.h libavcodec/vp8data.h libavcodec/vp8dsp.c libavcodec/vp8dsp.h libavcodec/x86/h264_intrapred_init.c libavcodec/x86/vp8dsp_init.c See: 89f2f5dbd7 and others Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-04-04 14:46:10 +02:00
..
ac3dsp_init.c
ac3dsp.asm
cabac.h	Use intel compliant CDQ instead of CLTD in inline asm.	2014-03-30 23:14:36 +02:00
cavsdsp.c
constants.c
constants.h
dca.h
dcadsp_init.c
dcadsp.asm
dct32.asm
dct_init.c
deinterlace.asm
dirac_dwt.c
dirac_dwt.h
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhdenc_init.c	x86: convert DNxHDenc inline asm to yasm	2014-03-27 23:16:17 +01:00
dnxhdenc.asm	x86: convert DNxHDenc inline asm to yasm	2014-03-27 23:16:17 +01:00
dsputil_init.c
dsputil_mmx.c
dsputil_qns_template.c	Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'	2014-03-26 14:50:55 +01:00
dsputil_x86.c
dsputil_x86.h
dsputil.asm
dsputilenc_mmx.c
dsputilenc.asm
dwt_yasm.asm
fdct.c
fft_init.c
fft.asm
fft.h
flacdsp_init.c
flacdsp.asm
fmtconvert_init.c
fmtconvert.asm
fpel_mmx.c
fpel.asm
fpel.h
h263_loopfilter.asm
h263dsp_init.c
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	Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'	2014-04-04 14:46:10 +02:00
h264_intrapred.asm
h264_qpel_8bit.asm
h264_qpel_10bit.asm
h264_qpel.c	x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation	2014-03-26 12:00:01 +01:00
h264_weight_10bit.asm
h264_weight.asm
h264chroma_init.c
h264dsp_init.c
hpeldsp_init.c	Merge remote-tracking branch 'qatar/master'	2014-03-26 16:55:46 +01:00
hpeldsp_mmx.c
hpeldsp_rnd_template.c	Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'	2014-03-26 14:50:55 +01:00
hpeldsp.asm
hpeldsp.h
idct_mmx_xvid.c
idct_sse2_xvid.c
idct_xvid.h
imdct36.asm
inline_asm.h
lossless_videodsp_init.c
lossless_videodsp.asm
lpc.c
Makefile	On2 VP7 decoder	2014-04-04 04:00:11 +02:00
mathops.h	Use intel compliant CDQ instead of CLTD in inline asm.	2014-03-30 23:14:36 +02:00
mlpdsp.c
motion_est.c
mpeg4qpel.asm
mpegaudiodsp.c
mpegvideo.c
mpegvideoenc_template.c	Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'	2014-03-26 14:50:55 +01:00
mpegvideoenc.c
pngdsp_init.c
pngdsp.asm
proresdsp_init.c
proresdsp.asm
qpel.asm
rnd_template.c
rv34dsp_init.c
rv34dsp.asm
rv40dsp_init.c
rv40dsp.asm
sbrdsp_init.c
sbrdsp.asm
simple_idct.c
snowdsp.c
ttadsp_init.c
ttadsp.asm
v210-init.c
v210.asm
vc1dsp_init.c
vc1dsp_mmx.c
vc1dsp.asm
vc1dsp.h
videodsp_init.c
videodsp.asm
vorbisdsp_init.c
vorbisdsp.asm
vp3dsp_init.c
vp3dsp.asm
vp6dsp_init.c
vp6dsp.asm
vp8dsp_init.c	Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'	2014-04-04 14:46:10 +02:00
vp8dsp_loopfilter.asm
vp8dsp.asm
vp9dsp_init.c	x86/vp9mc: add vp9 namespace.	2014-03-29 18:13:15 +01:00
vp9intrapred.asm
vp9itxfm.asm
vp9lpf.asm
vp9mc.asm	x86/vp9mc: add vp9 namespace.	2014-03-29 18:13:15 +01:00
vp56_arith.h
w64xmmtest.c