Merge commit '3df0d20028cb9d2daca16ac0dc6c3ab77183da37'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 15:39:21 +0000 (17:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 15:39:21 +0000 (17:39 +0200)
commit571effb3307dd41d67ce93e015aca2d3ae0d2841
tree65083eaf7faa4f60eff4841adf57e0ff9b6a87a3
parent909dbb07ebeb230d7603c8e431e0445c254cc6d0
parent3df0d20028cb9d2daca16ac0dc6c3ab77183da37
Merge commit '3df0d20028cb9d2daca16ac0dc6c3ab77183da37'

* commit '3df0d20028cb9d2daca16ac0dc6c3ab77183da37':
  Move Indeo4 frametypes into common header.

Conflicts:
libavcodec/ivi_common.c

See: d24673a2c80418c3c14dad523619f44f3ca8cb58
Merged-by: Michael Niedermayer <michaelni@gmx.at>