Michael Niedermayer 043d2affbb Merge remote-tracking branch 'qatar/master' ... * qatar/master: rawdec: Fix decoding of QT WRAW files. configure: report optimization for size separately mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers. mov: Support R10g codec identifier. riff/img2: Add JPEG 2000 codec IDs. riff: Add DAVC fourcc. riff: Add M263, XVIX, MMJP, CDV5 fourccs. rawvideo: Support auv2 fourcc. swscale: Remove unused variable from ff_bfin_get_unscaled_swscale(). h264: Fix assert that failed to compile with -DDEBUG. h264: Add x86 assembly for 10-bit weight/biweight H.264 functions. fate: remove output redirections from old regtest scripts Conflicts: configure libavcodec/rawdec.c libavformat/isom.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-06-22 05:16:40 +02:00
..
internal_bfin.S	Merge remote-tracking branch 'qatar/master' into master	2011-05-29 03:34:35 +02:00
swscale_bfin.c	Merge remote-tracking branch 'qatar/master'	2011-06-22 05:16:40 +02:00
yuv2rgb_bfin.c	swscale: fix compilation of bfin due to missing pixdesc.h header	2011-06-01 13:30:35 +02:00