FFmpeg/libavcodec/x86
Michael Niedermayer d7e5aebae7 Merge remote branch 'qatar/master'
* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
	Changelog
	doc/filters.texi
	ffmpeg.c
	libavcodec/ac3dec.h
	libavcodec/dsputil.c
	libavfilter/avfilter.h
	libavfilter/vf_scale.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-27 03:51:04 +02:00
..
ac3dsp_mmx.c
ac3dsp.asm
cavsdsp_mmx.c
dct32_sse.c
deinterlace.asm
dnxhd_mmx.c
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_mmx.c
dsputil_mmx.h
dsputil_yasm.asm
dsputilenc_mmx.c
dsputilenc_yasm.asm
fdct_mmx.c
fft_3dn2.c
fft_3dn.c
fft_mmx.asm Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
fft_sse.c Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
fft.c Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
fft.h Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
fmtconvert_mmx.c
fmtconvert.asm
h264_chromamc.asm
h264_deblock.asm
h264_i386.h
h264_idct.asm
h264_intrapred_init.c
h264_intrapred.asm
h264_qpel_mmx.c
h264_weight.asm
h264dsp_mmx.c
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h
lpc_mmx.c
Makefile
mathops.h
mlpdsp.c
motion_est_mmx.c
mpegaudiodec_mmx.c
mpegvideo_mmx_template.c
mpegvideo_mmx.c
simple_idct_mmx.c
snowdsp_mmx.c
vc1dsp_mmx.c
vc1dsp_yasm.asm
vp3dsp.asm
vp8dsp-init.c
vp8dsp.asm
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm
x86inc.asm
x86util.asm