• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 043d2aff
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    043d2aff
swscale_bfin.c 3.23 KB