-
Michael Niedermayer authored
* commit '21092172': imc: add required padding for GetBitContext buffer Conflicts: libavcodec/imc.c See: 7444cf9aMerged-by: Michael Niedermayer <michaelni@gmx.at>
551813a9
* commit '21092172': imc: add required padding for GetBitContext buffer Conflicts: libavcodec/imc.c See: 7444cf9aMerged-by: Michael Niedermayer <michaelni@gmx.at>