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>

diff --cc configure
index c9eedaf,b26394e..865851d
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -3203,7 -3139,7 +3202,8 @@@ if enabled sparc; the
      echo "VIS enabled               ${vis-no}"
  fi
  echo "debug symbols             ${debug-no}"
 +echo "strip symbols             ${stripping-no}"
+ echo "optimize for size         ${small-no}"
  echo "optimizations             ${optimizations-no}"
  echo "static                    ${static-no}"
  echo "shared                    ${shared-no}"

diff --cc libavcodec/h264.c
Simple merge

diff --cc libavcodec/x86/Makefile
Simple merge

diff --cc libavcodec/x86/h264dsp_mmx.c
Simple merge

diff --cc libavformat/isom.c
Simple merge

diff --cc libswscale/bfin/swscale_bfin.c
Simple merge

diff --cc tests/codec-regression.sh
Simple merge

diff --cc tests/lavfi-regression.sh
Simple merge