1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavcodec
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-21 03:06:54 +02:00
2011-06-02 20:06:00 +01:00
2011-06-15 10:58:25 +02:00
2011-06-19 03:54:15 +02:00
2011-05-21 02:31:27 +02:00
2011-06-02 20:06:00 +01:00
2011-06-10 22:13:26 +02:00
2011-05-24 19:10:28 +02:00
2011-06-19 03:54:15 +02:00
2011-05-25 11:29:47 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-06-15 10:57:26 +02:00
2011-06-07 18:22:53 +02:00
2011-06-21 04:45:29 +02:00
2011-06-15 01:16:58 +02:00
2011-06-20 01:58:18 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-21 13:48:10 +02:00
2011-05-21 13:48:10 +02:00
2011-06-20 21:03:59 +02:00
2011-06-21 22:18:59 +02:00
2011-06-02 20:06:00 +01:00
2011-06-21 13:17:10 +02:00
2011-06-02 20:06:00 +01:00