ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-05 12:33:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
e3e09f2bad
FFmpeg/libavcodec/x86
History
Michael Niedermayer e3e09f2bad Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  os_support: Choose between direct.h and io.h using a configure check
  os_support: Include io.h instead of direct.h on mingw32ce
  x86: ac3dsp: Only refer to the ac3_downmix_sse symbol if it has been declared
  swscale: Remove two bogus asserts
  ac3: move ac3_downmix() from dsputil to ac3dsp
  lavr/audio_mix_matrix: acknowledge the existence of LFE2.
  mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel.
  lavu/audioconvert: add a second low frequency channel.

Conflicts:
	doc/APIchanges
	libavcodec/ac3dsp.c
	libavcodec/ac3dsp.h
	libavcodec/mlp_parser.c
	libavutil/audioconvert.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13 15:35:50 +02:00
..
ac3dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
ac3dsp.asm Add some missing _EXTERNAL suffixes to yasm source files. 2012-08-31 15:39:03 +02:00
cabac.h
cavsdsp.c Merge remote-tracking branch 'qatar/master' 2012-09-08 12:53:44 +02:00
dct32.asm Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
deinterlace.asm
diracdsp_mmx.c diracdsp: Fix unprotected inline asm 2012-09-11 22:59:43 +02:00
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhdenc.c Merge remote-tracking branch 'qatar/master' 2012-09-08 12:53:44 +02:00
dsputil_avg_template.c Merge remote-tracking branch 'qatar/master' 2012-09-08 12:53:44 +02:00
dsputil_mmx.c Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
dsputil_mmx.h
dsputil_qns_template.c Merge remote-tracking branch 'qatar/master' 2012-09-08 12:53:44 +02:00
dsputil_rnd_template.c Merge remote-tracking branch 'qatar/master' 2012-09-08 12:53:44 +02:00
dsputil.asm Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
dsputilenc_mmx.c Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
dsputilenc.asm
dwt_yasm.asm
dwt.c
dwt.h
fdct.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
fft_init.c Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
fft.asm Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
fft.h
fmtconvert_init.c Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
fmtconvert.asm
h264_chromamc_10bit.asm x86: Split inline and external assembly #ifdefs 2012-08-31 01:53:25 +02:00
h264_chromamc.asm
h264_deblock_10bit.asm Add some missing _EXTERNAL suffixes to yasm source files. 2012-08-31 15:39:03 +02:00
h264_deblock.asm Add some missing _EXTERNAL suffixes to yasm source files. 2012-08-31 15:39:03 +02:00
h264_i386.h
h264_idct_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
h264_idct.asm
h264_intrapred_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
h264_intrapred_init.c Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
h264_intrapred.asm
h264_qpel_10bit.asm
h264_qpel.c Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
h264_weight_10bit.asm
h264_weight.asm
h264dsp_init.c x86/h264dsp_init: put a HAVE_YASM back 2012-09-09 17:21:02 +02:00
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h
imdct36.asm Add some missing _EXTERNAL suffixes to yasm source files. 2012-08-31 15:39:03 +02:00
lpc.c Merge remote-tracking branch 'qatar/master' 2012-09-08 12:53:44 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-09-10 14:06:20 +02:00
mathops.h
mlpdsp.c Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
motion_est.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
mpegaudiodec.c x86/mpegaudiodec: fix compilation failure on cygwin with undefined imdct36_blocks_avx 2012-09-09 18:39:03 +02:00
mpegvideo.c Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93' 2012-08-24 14:30:40 +02:00
mpegvideoenc_template.c Merge remote-tracking branch 'qatar/master' 2012-08-29 18:13:00 +02:00
mpegvideoenc.c Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
pngdsp_init.c Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
pngdsp.asm
proresdsp_init.c Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
proresdsp.asm Add some missing _EXTERNAL suffixes to yasm source files. 2012-08-31 15:39:03 +02:00
rv34dsp_init.c x86: Replace checks for CPU extensions and flags by convenience macros 2012-09-08 18:18:34 +02:00
rv34dsp.asm
rv40dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
rv40dsp.asm
sbrdsp_init.c x86: Replace checks for CPU extensions and flags by convenience macros 2012-09-08 18:18:34 +02:00
sbrdsp.asm
simple_idct.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
snowdsp.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
v210-init.c Fix compilation with yasm-0.6.2. 2012-09-01 10:59:16 +02:00
v210.asm Add some missing _EXTERNAL suffixes to yasm source files. 2012-08-31 15:39:03 +02:00
vc1dsp_mmx.c Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
vc1dsp.asm
vp3dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
vp3dsp.asm
vp8dsp_init.c Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
vp8dsp.asm
vp56_arith.h Merge remote-tracking branch 'qatar/master' 2012-09-06 16:23:17 +02:00
vp56dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
vp56dsp.asm
w64xmmtest.c