Michael Niedermayer d9b264bc73 Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42' ... * commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42': mpegvideo: Drop flags and flags2 Conflicts: libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/ratecontrol.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2015-05-22 20:24:41 +02:00
..
ac3dsp_init.c	x86: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED	2015-03-14 20:06:47 +01:00
ac3dsp.asm
audiodsp_init.c
audiodsp.asm
blockdsp_init.c
blockdsp.asm
bswapdsp_init.c
bswapdsp.asm
cabac.h
cavsdsp.c	avcodec/x86/cavsdsp: remove incorrect LOCAL_ALIGN tmp	2015-03-16 14:51:51 +01:00
constants.c
constants.h
dcadsp_init.c
dcadsp.asm
dct32.asm
dct_init.c
dct-test.c	avcodec/x86/dct-test: Use uint8_t for idct_simple_mmx_perm	2015-05-02 13:43:15 +02:00
deinterlace.asm	avcodec/x86/deinterlace: use INIT_MMX like other asm code does too	2015-05-05 02:41:15 +02:00
dirac_dwt.c
dirac_dwt.h
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhdenc_init.c
dnxhdenc.asm
dwt_yasm.asm
fdct.c
fdct.h
fdctdsp_init.c
fft_init.c
fft.asm
fft.h
flac_dsp_gpl.asm
flacdsp_init.c	lavc/flac: Fix encoding and decoding with high lpc.	2015-05-17 02:08:58 +02:00
flacdsp.asm
fmtconvert_init.c	Merge commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca'	2015-02-28 23:58:29 +01:00
fmtconvert.asm	Merge commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca'	2015-02-28 23:58:29 +01:00
fpel.asm
fpel.h
g722dsp_init.c
g722dsp.asm
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
h264_intrapred.asm
h264_qpel_8bit.asm
h264_qpel_10bit.asm
h264_qpel.c	x86: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED	2015-03-14 20:06:47 +01:00
h264_weight_10bit.asm
h264_weight.asm
h264chroma_init.c
h264dsp_init.c
hevc_deblock.asm
hevc_idct.asm
hevc_mc.asm
hevc_res_add.asm
hevc_sao.asm	x86/hevc_sao: use unaligned movs for sao_{band,filter} with width 8	2015-03-01 20:02:43 -03:00
hevcdsp_init.c
hevcdsp.h
hpeldsp_init.c	avcodec/x86/hpeldsp_init: Put CONFIG_* first in if()	2015-03-26 15:41:27 +01:00
hpeldsp_rnd_template.c
hpeldsp.asm
hpeldsp.h
huffyuvdsp_init.c
huffyuvdsp.asm
huffyuvencdsp_mmx.c
idctdsp_init.c
idctdsp.asm
idctdsp.h
imdct36.asm
inline_asm.h
lossless_audiodsp_init.c
lossless_audiodsp.asm
lossless_videodsp_init.c
lossless_videodsp.asm
lpc.c
Makefile	x86: xvid_idct: port MMX iDCT to yasm	2015-03-14 11:45:11 +01:00
mathops.h	Merge commit '48aef27f5232794e70ecef0d347b9f65e27a9bad'	2015-03-17 20:25:47 +01:00
me_cmp_init.c
me_cmp.asm
mlpdsp_init.c
mlpdsp.asm
mpegaudiodsp.c
mpegvideo.c	Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'	2015-05-22 20:24:41 +02:00
mpegvideodsp.c
mpegvideoenc_qns_template.c
mpegvideoenc_template.c
mpegvideoenc.c
mpegvideoencdsp_init.c
mpegvideoencdsp.asm
pixblockdsp_init.c
pixblockdsp.asm
pngdsp_init.c
pngdsp.asm
proresdsp_init.c	x86/proresdsp: remove ff_prores_idct_put_10_sse4	2015-03-16 01:52:44 -03:00
proresdsp.asm	x86/proresdsp: remove ff_prores_idct_put_10_sse4	2015-03-16 01:52:44 -03:00
qpel.asm
qpeldsp_init.c
qpeldsp.asm
rnd_template.c
rv34dsp_init.c
rv34dsp.asm
rv40dsp_init.c	x86: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED	2015-03-14 20:06:47 +01:00
rv40dsp.asm
sbrdsp_init.c
sbrdsp.asm
simple_idct.c
simple_idct.h
snowdsp.c	avcodec/snow: mark dwt init as av_cold	2015-02-27 16:53:37 +01:00
svq1enc_init.c
svq1enc.asm
ttadsp_init.c
ttadsp.asm
v210-init.c	avcodec/v210dec: Add ff prefix to v210_x86_init()	2015-02-27 19:08:09 +01:00
v210.asm
v210enc_init.c
v210enc.asm
vc1dsp_init.c
vc1dsp_mmx.c	x86: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED	2015-03-14 20:06:47 +01:00
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	x86: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED	2015-03-14 20:06:47 +01:00
vp8dsp_loopfilter.asm
vp8dsp.asm
vp9dsp_init.c	avcodec/x86/vp9dsp_init: Fix mix of declaration and statement	2015-05-07 14:33:10 +02:00
vp9intrapred.asm
vp9itxfm.asm	vp9: disable more pmulhrsw optimizations in idct16/32.	2015-05-14 14:15:27 -04:00
vp9lpf.asm
vp9mc.asm
vp56_arith.h
w64xmmtest.c
xvididct_init.c	x86/xvididct: add some yasm guards	2015-03-20 02:38:20 -03:00
xvididct.asm	x86: xvid_idct: SSE2 merged add version	2015-03-14 13:36:47 +01:00
xvididct.h	x86/xvididct: remove obsolete function prototypes	2015-03-20 02:38:14 -03:00