Merge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 08:19:15 +0000 (10:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 08:19:15 +0000 (10:19 +0200)
commitd3850ac5b9c7e0f6cd77d652a3a8985c6ca6732a
tree6352a7805767fb3286f8d1d00c5419ad70479909
parent0c7bd340230635676507dbca998d04878c0117da
parent0cb83c563848bf8f8365e7bd30e7e6b57ef360f0
Merge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'

* commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0':
  indeo4: Check the block size if reusing the band configuration

Conflicts:
libavcodec/indeo4.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/indeo4.c