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
..
2011-06-20 23:36:40 +01:00
2011-06-19 04:02:06 +02:00
2011-06-18 07:52:19 -04:00
2011-06-16 23:18:50 +02:00
2011-06-16 23:18:50 +02:00
2011-06-21 03:38:25 +02:00
2011-06-13 21:16:30 -07:00
2011-06-15 02:15:25 +02:00
2011-06-21 21:41:04 +02:00
2011-06-21 15:24:13 +02:00
2011-06-22 05:16:40 +02:00
2011-06-22 05:16:40 +02:00