Merge commit 'e121ac634ba324a318f4a97f978dcfb48da6b735'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Jun 2014 11:54:17 +0000 (13:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Jun 2014 11:56:52 +0000 (13:56 +0200)
commitb222e0773c78918a59e7748b56eed0bdd8afa043
treebdeddf2e8604da5131c52f2d70ae70e320cf5c5e
parent35bb74900b951dccdc7481e98a00246f59ec2420
parente121ac634ba324a318f4a97f978dcfb48da6b735
Merge commit 'e121ac634ba324a318f4a97f978dcfb48da6b735'

* commit 'e121ac634ba324a318f4a97f978dcfb48da6b735':
  indeo45: use is_indeo4 context flag instead of checking codec ID

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