Merge commit 'aa3ec219e1a5cc0e96ddec6ea83312ec780448f5' into release/2.4
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 20 Aug 2015 12:10:08 +0000 (14:10 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 20 Aug 2015 12:11:30 +0000 (14:11 +0200)
* commit 'aa3ec219e1a5cc0e96ddec6ea83312ec780448f5':
  imc: add required padding for GetBitContext buffer

Conflicts:
libavcodec/imc.c

See: 7444cf9a9c0b8b2bba8198af2823521c654a48f4
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
libavcodec/imc.c

Simple merge