Merge commit 'c5da487a38f93b981c4933d4e0b09c49c319fbb7' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 15:10:43 +0000 (16:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 15:10:53 +0000 (16:10 +0100)
commit36678748333db11f68d4ac1d6a70f32140c883d1
treef67af207276016945c7c160312c261edec2635dd
parentc08127c5e6922e40ffc4e4f7ad26fd119a8a526f
parentc5da487a38f93b981c4933d4e0b09c49c319fbb7
Merge commit 'c5da487a38f93b981c4933d4e0b09c49c319fbb7' into release/0.10

* commit 'c5da487a38f93b981c4933d4e0b09c49c319fbb7':
  indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocks
  indeo: Refactor ff_ivi_dec_huff_desc

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