Michael Niedermayer b81f8880e0 Merge remote-tracking branch 'qatar/master' ... * qatar/master: (23 commits) fix AC3ENC_OPT_MODE_ON/OFF h264: fix HRD parameters parsing prores: implement multithreading. prores: idct sse2/sse4 optimizations. swscale: use aligned move for storage into temporary buffer. prores: extract idct into its own dspcontext and merge with put_pixels. h264: fix invalid shifts in init_cavlc_level_tab() intfloat_readwrite: fix signed addition overflows mov: do not misreport empty stts mov: cosmetics, fix for and if spacing id3v2: fix NULL pointer dereference mov: read album_artist atom mov: fix disc/track numbers and totals doc: fix references to obsolete presets directories for avconv/ffmpeg flashsv: return more meaningful error value flashsv: fix typo in av_log() message smacker: validate channels and sample format. smacker: check buffer size before reading output size smacker: validate number of channels smacker: Separate audio flags from sample rates in smacker demuxer. ... Conflicts: cmdutils.h doc/ffmpeg.texi libavcodec/Makefile libavcodec/motion_est_template.c libavformat/id3v2.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-10-12 05:40:57 +02:00
..
rgb2rgb_template.c
rgb2rgb.c
scale.asm	Merge remote-tracking branch 'qatar/master'	2011-10-12 05:40:57 +02:00
swscale_mmx.c	swscale: add 14bit support to the "MMX/SSE2/SSSE3/SSE4 versions for horizontal scaling"	2011-09-14 00:19:03 +02:00
swscale_template.c	swscale: Fix prototypes of *toyv12 so they can be used with planar rgb input.	2011-10-09 02:04:23 +02:00
yuv2rgb_mmx.c
yuv2rgb_template.c