1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer 076300bf8b Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'
* commit 'bfe5454cd238b16e7977085f880205229103eccb':
  lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h
  lavf: move "MP3 " fourcc from riff to nut
  fate: vpx: Add dependencies
  fate: Fix wavpack-matroskamode test dependencies
  x86: dsputilenc: port to cpuflags

Conflicts:
	libavformat/internal.h
	libavformat/nut.c
	tests/fate/vpx.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 13:45:57 +01:00
..
ac3dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
ac3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
cabac.h get_cabac_inline_x86: workaround clang bug with disabled optimizations 2012-09-18 00:45:29 +02:00
cavsdsp.c Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' 2012-11-01 13:11:51 +01:00
dct32.asm build: Drop AVX assembly ifdefs 2012-11-11 20:43:28 +01:00
deinterlace.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
diracdsp_mmx.c Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' 2012-11-01 13:11:51 +01:00
diracdsp_mmx.h Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' 2012-11-01 13:11:51 +01:00
diracdsp_yasm.asm Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' 2012-10-31 13:57:09 +01:00
dnxhdenc.c
dsputil_avg_template.c Merge remote-tracking branch 'qatar/master' 2012-11-26 02:17:02 +01:00
dsputil_mmx.c Merge commit '5ae72f54532960cb9eae82a1c9e8d505106c022b' 2012-11-26 16:11:02 +01:00
dsputil_mmx.h Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' 2012-11-01 13:11:51 +01:00
dsputil_qns_template.c
dsputil_rnd_template.c
dsputil.asm Merge remote-tracking branch 'qatar/master' 2012-11-26 02:17:02 +01:00
dsputilenc_mmx.c Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
dsputilenc.asm Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 2012-11-29 13:45:57 +01:00
dwt_yasm.asm dwt_yasm/vertical_compose: fix width witdth argument. 2012-11-11 12:41:35 +01:00
dwt.c
dwt.h
fdct.c Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' 2012-11-01 13:11:51 +01:00
fft_init.c Merge remote-tracking branch 'qatar/master' 2012-10-08 21:46:34 +02:00
fft.asm build: Drop AVX assembly ifdefs 2012-11-11 20:43:28 +01:00
fft.h
fmtconvert_init.c
fmtconvert.asm Merge remote-tracking branch 'qatar/master' 2012-11-19 14:24:20 +01:00
h264_chromamc_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
h264_chromamc.asm Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc' 2012-11-26 00:43:45 +01:00
h264_deblock_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
h264_deblock.asm Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
h264_i386.h
h264_idct_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
h264_idct.asm Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1' 2012-11-28 13:32:17 +01:00
h264_intrapred_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
h264_intrapred_init.c Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
h264_intrapred.asm Merge remote-tracking branch 'qatar/master' 2012-11-19 14:24:20 +01:00
h264_qpel_8bit.asm Merge commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c' 2012-11-26 14:24:19 +01:00
h264_qpel_10bit.asm x86: h264_qpel_10bit: drop unused parameter from MC10/MC20/MC30 macros 2012-11-10 14:49:09 +01:00
h264_qpel.c Merge remote-tracking branch 'qatar/master' 2012-11-26 02:17:02 +01:00
h264_weight_10bit.asm x86: h264_weight_10bit: port to cpuflags 2012-11-13 19:07:09 +01:00
h264_weight.asm Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563' 2012-11-28 13:27:18 +01:00
h264dsp_init.c Merge commit '1f3f896564501c23b44fcf605567c78ce066b539' 2012-11-29 13:35:56 +01:00
idct_mmx_xvid.c Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' 2012-11-01 13:11:51 +01:00
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' 2012-11-01 13:11:51 +01:00
imdct36.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
lpc.c
Makefile Merge remote-tracking branch 'qatar/master' 2012-11-26 02:17:02 +01:00
mathops.h
mlpdsp.c Merge remote-tracking branch 'qatar/master' 2012-10-11 15:55:41 +02:00
motion_est.c Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' 2012-11-01 13:11:51 +01:00
mpegaudiodec.c Merge remote-tracking branch 'qatar/master' 2012-10-08 21:46:34 +02:00
mpegvideo.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
mpegvideoenc_template.c x86/mpegvideoenc_template: use av_assert 2012-11-23 17:57:22 +01:00
mpegvideoenc.c Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' 2012-11-01 13:11:51 +01:00
pngdsp_init.c Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
pngdsp.asm x86: mmx2 ---> mmxext in asm constructs 2012-11-14 00:58:51 +01:00
proresdsp_init.c
proresdsp.asm Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' 2012-10-31 13:57:09 +01:00
rv34dsp_init.c x86: mmx2 ---> mmxext in asm constructs 2012-11-14 00:58:51 +01:00
rv34dsp.asm x86: mmx2 ---> mmxext in asm constructs 2012-11-14 00:58:51 +01:00
rv40dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
rv40dsp.asm x86: mmx2 ---> mmxext in asm constructs 2012-11-14 00:58:51 +01:00
sbrdsp_init.c
sbrdsp.asm x86: yasm: Use complete source path for macro helper %includes 2012-10-31 00:37:42 +01:00
simple_idct.c
snowdsp.c
v210-init.c
v210.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
vc1dsp_init.c x86: mmx2 ---> mmxext in asm constructs 2012-11-14 00:58:51 +01:00
vc1dsp_mmx.c Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' 2012-11-01 13:11:51 +01:00
vc1dsp.asm Merge commit '930e26a3ea9d223e04bac4cdde13697cec770031' 2012-11-05 22:36:05 +01:00
vc1dsp.h Merge remote-tracking branch 'qatar/master' 2012-10-08 21:46:34 +02:00
vp3dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
vp3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
vp8dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
vp8dsp.asm Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
w64xmmtest.c