• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 01fcbdf9
    Michael Niedermayer authored
    * qatar/master:
      smacker: Sanity check huffman tables found in the headers.
      smacker: remove dead store
      qdm2: Check data block size for bytes to bits overflow.
      mxfdec: Fix files with essence containers larger than 2 GiB.
      mxfdec: Employ correct printf conversion specifiers for POSIX int types.
      vc1: always read the bfraction element for interlaced fields
      fate: add XWD image regression test
      lavf: prevent infinite loops while flushing in avformat_find_stream_info
      matroskadec: Pad AAC extradata.
      ismindex: Fix build on mingw
    
    Conflicts:
    	libavformat/mxfdec.c
    	libavformat/utils.c
    	tests/lavf-regression.sh
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    01fcbdf9
xwd 151 Bytes