* commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912': indeo: Refactor ff_ivi_dec_huff_desc Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <michaelni@gmx.at>