Changeset 625b2903 in ffmpeg

Timestamp:

Nov 26, 2013, 12:00:46 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

75ec40b0

Parents:

cd51d9a9 (diff), 1eaac1d6 (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 '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025'

• commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025': mpeg12dec: Extract CC user data into frame side data

Conflicts:

doc/APIchanges
libavutil/version.h

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

(No files)