Changeset 357168bc in ffmpeg

Timestamp:

Jun 27, 2014, 12:05:22 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5a636383

Parents:

826726b8 (diff), 5ec6d152 (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/26/14 23:31:42)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/27/14 00:05:22)

Message:

Merge commit '5ec6d152e26c570c0a16ec72c1f354db95708179'

• commit '5ec6d152e26c570c0a16ec72c1f354db95708179': indeo4: B-frames decoding

Conflicts:

libavcodec/ivi_common.c

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

(No files)