Merge commit '210921722bf828b3b895ebcbc34374e6c4452c6f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jun 2015 15:43:24 +0000 (17:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jun 2015 15:44:13 +0000 (17:44 +0200)
commit551813a963b2c04d0211a6c87ecd400bdcf2c5f7
treecbc953e59f298f5928ca9d4b94aa3c75088da98b
parent840465ebf979ee4fbab308f1019aa6f7026373c7
parent210921722bf828b3b895ebcbc34374e6c4452c6f
Merge commit '210921722bf828b3b895ebcbc34374e6c4452c6f'

* commit '210921722bf828b3b895ebcbc34374e6c4452c6f':
  imc: add required padding for GetBitContext buffer

Conflicts:
libavcodec/imc.c

See: 7444cf9a9c0b8b2bba8198af2823521c654a48f4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/imc.c