• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 349c6241
    Michael Niedermayer authored
    * qatar/master:
      indeo: Make ivi_calc_band_checksum() static, it is only used in one file.
      indeo: Drop unused debug function ivi_check_band().
      avcodec/utils: cast a function argument to shut up a compiler warning
      truemotion1: remove disabled code
      fix typo in comment
      fate: fix dependencies for non-SAMPLES avconv tests
      indeo: check for invalid motion vectors
      indeo: check that band output buffer exists
      indeo: clear allocated band buffers
      indeo: track tile macroblock size
      indeo: check custom Huffman tables for errors
      factor out common decoding code for Indeo 4 and Indeo 5
      mp3: fix start band index for block type 2 in 8kHz audio
      lavf: change some (de)muxer names to lowercase
      lavf: make output format matching case insensitive
    
    Conflicts:
    	libavcodec/indeo4.c
    	libavcodec/indeo5.c
    	libavcodec/ivi_common.c
    	libavcodec/utils.c
    	tests/fate/video.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    349c6241
ivi_common.h 15.4 KB