Merge commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Sep 2012 11:52:48 +0000 (13:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Sep 2012 11:52:48 +0000 (13:52 +0200)
commite5ce6d447b952658b8a8568c807baeab5cf58783
tree74af04c23abf7c610e0e944a7df4c7ca87f67a2f
parent301f6da0397eb8955adf355229521997390d918a
parentd05f72c75445969cd7bdb1d860635c9880c67fb6
Merge commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6'

* commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6':
  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: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dfa.c
libavcodec/indeo3.c
libavcodec/indeo5.c
libavcodec/ivi_common.c
libavcodec/ivi_common.h
libavcodec/wmalosslessdec.c