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
ac3dsp.asm
audiodsp_init.c
audiodsp.asm
blockdsp_init.c
blockdsp.asm
bswapdsp_init.c
bswapdsp.asm
cabac.h
cavsdsp.c
constants.c
constants.h
dcadsp_init.c
dcadsp.asm
dct32.asm
dct_init.c
dct-test.c
deinterlace.asm
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
flacdsp.asm
fmtconvert_init.c
fmtconvert.asm
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
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
hevcdsp_init.c
hevcdsp.h
hpeldsp_init.c
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
mathops.h
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
proresdsp.asm
qpel.asm
qpeldsp_init.c
qpeldsp.asm
rnd_template.c
rv34dsp_init.c
rv34dsp.asm
rv40dsp_init.c
rv40dsp.asm
sbrdsp_init.c
sbrdsp.asm
simple_idct.c
simple_idct.h
snowdsp.c
svq1enc_init.c
svq1enc.asm
ttadsp_init.c
ttadsp.asm
v210-init.c
v210.asm
v210enc_init.c
v210enc.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
vp8dsp_loopfilter.asm
vp8dsp.asm
vp9dsp_init.c
vp9intrapred.asm
vp9itxfm.asm
vp9lpf.asm
vp9mc.asm
vp56_arith.h
w64xmmtest.c
xvididct_init.c
xvididct.asm
xvididct.h