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-02 10:16:20 -07:00
2011-06-20 22:18:23 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-22 05:16:40 +02:00
2011-04-18 23:55:11 +02:00
2011-06-16 20:24:57 +02:00
2011-06-21 12:37:58 +01:00
2011-03-19 13:35:52 +00:00
2011-03-26 16:39:22 -04:00
2011-05-20 13:50:52 +01:00
2011-06-21 12:37:58 +01:00
2011-06-22 05:16:40 +02:00
2011-06-21 12:37:58 +01:00
2011-05-12 04:51:24 +02:00
2011-03-19 13:33:20 +00:00
2011-04-29 18:08:46 +02:00
2011-03-19 13:33:20 +00:00