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)
commit7da1e8a0d89159912ff1b1ac0525e5e8719f2c52
treea166874bfea9c1148776e557fde89f848149127c
parent8b0a063ba912b9844d8e7cf4d8f9014832f77687
parentaa3ec219e1a5cc0e96ddec6ea83312ec780448f5
Merge commit 'aa3ec219e1a5cc0e96ddec6ea83312ec780448f5' into release/2.4

* commit 'aa3ec219e1a5cc0e96ddec6ea83312ec780448f5':
  imc: add required padding for GetBitContext buffer

Conflicts:
libavcodec/imc.c

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