Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 22 Jun 2011 03:16:40 +0000 (05:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 22 Jun 2011 03:16:40 +0000 (05:16 +0200)
commit043d2affbbc124c6d802fe2989d9b1ed73825368
tree5cf6ebba7a816fe0475cee59e9e946d726940607
parent86824c1dcb3eaffc2b143de452e8082dc3c59822
parent67e7dc54049d9b51a0c2168c8265145a9aef7780
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>
configure
libavcodec/h264.c
libavcodec/x86/Makefile
libavcodec/x86/h264dsp_mmx.c
libavformat/isom.c
libswscale/bfin/swscale_bfin.c
tests/codec-regression.sh
tests/lavfi-regression.sh