* commit 'f6f36ca8':
  indeo: Refactor ff_ivi_dec_huff_desc

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