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)
* commit '210921722bf828b3b895ebcbc34374e6c4452c6f':
  imc: add required padding for GetBitContext buffer

Conflicts:
libavcodec/imc.c

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

Simple merge