Changeset 54623619 in ffmpeg

Timestamp:

Jul 14, 2013, 10:38:54 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8c0bb195

Parents:

ac20ba35 (diff), 8435bca0 (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> (07/14/13 10:34:07)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/14/13 10:38:54)

Message:

Merge commit '8435bca087c0e79385763c51de009fd89390b6a5'

• commit '8435bca087c0e79385763c51de009fd89390b6a5': indeo4: Do not access missing reference MV

Conflicts:

libavcodec/indeo4.c

See: 5216245a, aae44fb4

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

(No files)