1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +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 Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
ac3dsp.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
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 Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
deinterlace.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
diracdsp_mmx.c cleanup: remove various double end ';' all over the code. 2011-11-16 07:48:23 +01:00
diracdsp_mmx.h DIRAC Decoder stable version, MMX support removed. 2011-10-30 21:50:08 +01:00
diracdsp_yasm.asm diracdec: obmc accesses arent aligned for all files. 2011-11-15 23:37:40 +01:00
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 Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
dwt_yasm.asm dirac: drop unused END_HORIZONTAL 2011-11-01 22:01:11 +01:00
dwt.c cleanup: remove various double end ';' all over the code. 2011-11-16 07:48:23 +01:00
dwt.h DIRAC Decoder stable version, MMX support removed. 2011-10-30 21:50:08 +01:00
fdct_mmx.c Make fdct_r_row_sse2 const. 2011-11-05 15:37:02 +01:00
fft_3dn2.c
fft_3dn.c
fft_mmx.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
fft_sse.c
fft.c
fft.h
fmtconvert_mmx.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
fmtconvert.asm Merge remote-tracking branch 'qatar/master' 2011-11-04 01:44:06 +01:00
h264_chromamc_10bit.asm
h264_chromamc.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_deblock_10bit.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_deblock.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_i386.h Revert "Revert commit 599b4c6efddaed33b1667c386b34b07729ba732b" 2012-01-09 03:32:06 +01:00
h264_idct_10bit.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_idct.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_intrapred_10bit.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_intrapred_init.c h264: 4:2:2 intra decoding support 2011-10-21 01:00:41 -07:00
h264_intrapred.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_qpel_10bit.asm
h264_qpel_mmx.c
h264_weight_10bit.asm h264_weight: initialize "height" function argument properly. 2011-10-22 00:23:24 -07:00
h264_weight.asm Merge remote-tracking branch 'qatar/master' 2011-11-06 02:23:34 +01:00
h264dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
idct_mmx_xvid.c
idct_mmx.c Remove redundant filename self-references inside files. 2011-11-08 17:52:56 +01:00
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 Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
proresdsp.asm proresdsp: fix rounding 2011-10-12 22:18:35 +02:00
rv40dsp.c
simple_idct_mmx.c
snowdsp_mmx.c
v210-init.c Add V210 SIMD 2011-10-19 20:26:55 +02:00
v210.asm Add V210 SIMD 2011-10-19 20:26:55 +02:00
vc1dsp_mmx.c
vc1dsp_yasm.asm Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
vp3dsp.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
vp8dsp-init.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
vp8dsp.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00