• Michael Niedermayer's avatar
    Merge commit 'd05f72c7' · e5ce6d44
    Michael Niedermayer authored
    * commit 'd05f72c7':
      dfa: improve boundary checks in decode_dds1()
      wmalosslessdec: Fix reading too many bits in decode_channel_residues()
      wmalosslessdec: fix a get_bits(0) in decode_ac_filter
      wmalosslessdec: make MCLMS arrays big enough for what is written into them.
      indeo4/5: check empty tile size in decode_mb_info().
      ivi_common: make ff_ivi_process_empty_tile() static.
      indeo5: check tile size in decode_mb_info().
      indeo3: fix out of cell write.
    
    Conflicts:
    	libavcodec/dfa.c
    	libavcodec/indeo3.c
    	libavcodec/indeo5.c
    	libavcodec/ivi_common.c
    	libavcodec/wmalosslessdec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e5ce6d44
indeo5.c 22.8 KB