Changeset 91db8ff in ffmpeg

Timestamp:

May 28, 2013, 6:04:02 AM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2ad28840

Parents:

97f7586c (diff), 564b7e0c (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.

Message:

Merge commit '564b7e0c0095768cd20001b28154d69462be54e7'

• commit '564b7e0c0095768cd20001b28154d69462be54e7': matroskadec: silently skip CodecState element. smacker: fix off-by-one error in palette expanding code

Conflicts:

libavformat/smacker.c

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

(No files)