1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer 94d68a41fa Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615':
  lavc: AV-prefix all codec flags

Conflicts:
	doc/examples/muxing.c
	ffmpeg.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/aacdec.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.c
	libavcodec/ac3enc_float.c
	libavcodec/atrac1.c
	libavcodec/atrac3.c
	libavcodec/atrac3plusdec.c
	libavcodec/dcadec.c
	libavcodec/ffv1enc.c
	libavcodec/h264.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_mb.c
	libavcodec/imc.c
	libavcodec/libmp3lame.c
	libavcodec/libtheoraenc.c
	libavcodec/libtwolame.c
	libavcodec/libvpxenc.c
	libavcodec/libxavs.c
	libavcodec/libxvid.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegaudiodec_template.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/nellymoserdec.c
	libavcodec/nellymoserenc.c
	libavcodec/nvenc.c
	libavcodec/on2avc.c
	libavcodec/options_table.h
	libavcodec/opus_celt.c
	libavcodec/pngenc.c
	libavcodec/ra288.c
	libavcodec/ratecontrol.c
	libavcodec/twinvq.c
	libavcodec/vc1_block.c
	libavcodec/vc1_loopfilter.c
	libavcodec/vc1_mc.c
	libavcodec/vc1dec.c
	libavcodec/vorbisdec.c
	libavcodec/vp3.c
	libavcodec/wma.c
	libavcodec/wmaprodec.c
	libavcodec/x86/hpeldsp_init.c
	libavcodec/x86/me_cmp_init.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 22:10:35 +02:00
..
ac3dsp_init.c
ac3dsp.asm
audiodsp_init.c
audiodsp.asm
blockdsp_init.c
blockdsp.asm avcodec/x86: add missing colon to labels 2015-07-26 02:50:14 -03:00
bswapdsp_init.c
bswapdsp.asm Merge commit 'a344e5d094ebcf9a23acf3a27c56cbbbc829db42' 2015-07-17 23:20:14 +02:00
cabac.h
cavsdsp.c
constants.c
constants.h
dcadsp_init.c
dcadsp.asm avcodec/x86: add missing colon to labels 2015-07-26 02:50:14 -03:00
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 avcodec/x86: add missing colon to labels 2015-07-26 02:50:14 -03:00
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 avcodec/x86: add missing colon to labels 2015-07-26 02:50:14 -03:00
h264_qpel.c Merge commit 'b7a4127a45b780d76e6b09427a3d0197c4bc1cdb' 2015-06-12 21:55:40 +02:00
h264_weight_10bit.asm
h264_weight.asm avcodec/x86: add missing colon to labels 2015-07-26 02:50:14 -03:00
h264chroma_init.c
h264dsp_init.c
hevc_deblock.asm
hevc_idct.asm
hevc_mc.asm avcodec/x86: add missing colon to labels 2015-07-26 02:50:14 -03:00
hevc_res_add.asm
hevc_sao.asm avcodec/x86: add missing colon to labels 2015-07-26 02:50:14 -03:00
hevcdsp_init.c
hevcdsp.h
hpeldsp_init.c Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 2015-07-27 22:10:35 +02:00
hpeldsp_rnd_template.c
hpeldsp.asm
hpeldsp.h
huffyuvdsp_init.c
huffyuvdsp.asm avcodec/x86: add missing colon to labels 2015-07-26 02:50:14 -03:00
huffyuvencdsp_mmx.c
idctdsp_init.c
idctdsp.asm
idctdsp.h
imdct36.asm
inline_asm.h
jpeg2000dsp_init.c avcodec/jpeg200dsp: add ff_rct_int_{sse2,avx2} 2015-06-13 16:53:31 -03:00
jpeg2000dsp.asm avcodec/x86: add missing colon to labels 2015-07-26 02:50:14 -03:00
lossless_audiodsp_init.c
lossless_audiodsp.asm
lossless_videodsp_init.c
lossless_videodsp.asm
lpc.c
Makefile Merge commit 'd42191c78befc1983f23b1899b2dda513b72f1ed' 2015-07-17 22:45:34 +02:00
mathops.h
me_cmp_init.c Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 2015-07-27 22:10:35 +02:00
me_cmp.asm avcodec/x86: add missing colon to labels 2015-07-26 02:50:14 -03:00
mlpdsp_init.c
mlpdsp.asm
mpegaudiodsp.c
mpegvideo.c Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 2015-07-27 22:10:35 +02:00
mpegvideodsp.c
mpegvideoenc_qns_template.c
mpegvideoenc_template.c
mpegvideoenc.c
mpegvideoencdsp_init.c Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 2015-07-27 22:10:35 +02:00
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 avcodec/x86: add missing colon to labels 2015-07-26 02:50:14 -03:00
ttadsp_init.c
ttadsp.asm
v210-init.c
v210.asm avcodec/x86: add missing colon to labels 2015-07-26 02:50:14 -03:00
v210enc_init.c
v210enc.asm avcodec/x86: add missing colon to labels 2015-07-26 02:50:14 -03:00
vc1dsp_init.c
vc1dsp_mmx.c doc: avoid incorrect phrase 'allows to' 2015-06-16 21:48:51 +02:00
vc1dsp.asm
vc1dsp.h
videodsp_init.c videodsp: assert that linesize is larger than width 2015-07-08 01:32:04 +02:00
videodsp.asm
vorbisdsp_init.c
vorbisdsp.asm
vp3dsp_init.c Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 2015-07-27 22:10:35 +02:00
vp3dsp.asm avcodec/x86: add missing colon to labels 2015-07-26 02:50:14 -03:00
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