1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer dd3ca3ea15 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: Add tests for more AAC features.
  aacps: Add missing newline in error message.
  fate: Add tests for vc1/wmapro in ism.
  aacdec: Add a fate test for 5.1 channel SBR.
  aacdec: Turn off PS for multichannel files that use PCE based configs.
  cabac: remove put_cabac_u/ueg from cabac-test.
  swscale: RGB4444 and BGR444 input
  FATE: add test for xWMA demuxer.
  FATE: add test for SMJPEG demuxer and associated IMA ADPCM audio decoder.
  mpegaudiodec: optimized iMDCT transform
  mpegaudiodec: change imdct window arrangment for better pointer alignment
  mpegaudiodec: move imdct and windowing function to mpegaudiodsp
  mpegaudiodec: interleave iMDCT buffer to simplify future SIMD implementations
  swscale: convert yuy2/uyvy/nv12/nv21ToY/UV from inline asm to yasm.
  FATE: test to exercise WTV demuxer.
  mjpegdec: K&R formatting cosmetics
  swscale: K&R formatting cosmetics for code examples
  swscale: K&R reformatting cosmetics for header files
  FATE test: cvid-grayscale; ensures that the grayscale Cinepak variant is exercised.

Conflicts:
	libavcodec/cabac.c
	libavcodec/mjpegdec.c
	libavcodec/mpegaudiodec.c
	libavcodec/mpegaudiodsp.c
	libavcodec/mpegaudiodsp.h
	libavcodec/mpegaudiodsp_template.c
	libavcodec/x86/Makefile
	libavcodec/x86/imdct36_sse.asm
	libavcodec/x86/mpegaudiodec_mmx.c
	libswscale/swscale-test.c
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/x86/swscale_template.c
	tests/fate/demux.mak
	tests/fate/microsoft.mak
	tests/fate/video.mak
	tests/fate/wma.mak
	tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-10 03:50:41 +01:00
..
ac3dsp_mmx.c
ac3dsp.asm
cabac.h cabac: 3rd try at working around a compiler bug in clang. 2012-01-09 16:04:26 +01:00
cavsdsp_mmx.c
dct32_sse.asm
deinterlace.asm
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhd_mmx.c
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_mmx.c Merge remote-tracking branch 'qatar/master' 2011-12-14 23:58:10 +01:00
dsputil_mmx.h
dsputil_yasm.asm Add forgotten %ifdef HAVE_AVX. 2011-12-03 20:46:42 +01:00
dsputilenc_mmx.c
dsputilenc_yasm.asm
dwt_yasm.asm
dwt.c
dwt.h
fdct_mmx.c
fft_3dn2.c
fft_3dn.c
fft_mmx.asm
fft_sse.c
fft.c
fft.h
fmtconvert_mmx.c
fmtconvert.asm
h264_chromamc_10bit.asm
h264_chromamc.asm
h264_deblock_10bit.asm
h264_deblock.asm
h264_i386.h Revert "Revert commit 599b4c6efddaed33b1667c386b34b07729ba732b" 2012-01-09 03:32:06 +01:00
h264_idct_10bit.asm
h264_idct.asm
h264_intrapred_10bit.asm
h264_intrapred_init.c
h264_intrapred.asm
h264_qpel_10bit.asm
h264_qpel_mmx.c
h264_weight_10bit.asm
h264_weight.asm
h264dsp_mmx.c
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h
imdct36_sse.asm mpegaudiodec: optimized iMDCT transform 2012-01-08 17:40:55 -08:00
lpc_mmx.c
Makefile mpegaudiodec: optimized iMDCT transform 2012-01-08 17:40:55 -08:00
mathops.h
mlpdsp.c
motion_est_mmx.c
mpegaudiodec_mmx.c Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
mpegvideo_mmx_template.c
mpegvideo_mmx.c
png_mmx.c
proresdsp-init.c
proresdsp.asm
rv40dsp.c
simple_idct_mmx.c
snowdsp_mmx.c
v210-init.c
v210.asm
vc1dsp_mmx.c
vc1dsp_yasm.asm Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
vp3dsp.asm
vp8dsp-init.c
vp8dsp.asm
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm