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
..
dsputil_align.c	Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder.	2011-04-10 22:33:42 +02:00
dsputil_sh4.c	Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder.	2011-04-10 22:33:42 +02:00
dsputil_sh4.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
idct_sh4.c	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
Makefile
qpel.c	Merge remote branch 'qatar/master'	2011-04-27 03:51:04 +02:00
sh4.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00