Changeset 551813a9 in ffmpeg

Timestamp:

Jun 9, 2015, 3:44:13 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

962654f2

Parents:

840465eb (diff), 2109217 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (06/09/15 15:43:24)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/09/15 15:44:13)

Message:

Merge commit '210921722bf828b3b895ebcbc34374e6c4452c6f'

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

Conflicts:

libavcodec/imc.c

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

(No files)