Merge commit '62256010e9bc8879e2bf7f3b94af8ff85e239082'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Jul 2013 10:02:53 +0000 (12:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Jul 2013 10:02:53 +0000 (12:02 +0200)
commit9b10440dcd1a250c0c00cfcd83ae62a4ae6d2544
tree22680989ea861b23a1ccdee3f91b5d39cd0688e1
parent0e2056056fc8d70046c6e3a83c94c3f1b4ea70a4
parent62256010e9bc8879e2bf7f3b94af8ff85e239082
Merge commit '62256010e9bc8879e2bf7f3b94af8ff85e239082'

* commit '62256010e9bc8879e2bf7f3b94af8ff85e239082':
  indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocks

Conflicts:
libavcodec/ivi_common.c

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