Michael Niedermayer 551813a963 Merge commit '210921722bf828b3b895ebcbc34374e6c4452c6f' ...

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

Conflicts:
	libavcodec/imc.c

See: 7444cf9a9c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2015-06-09 17:44:13 +02:00

34 KiB

Raw Blame History

View Raw