Changeset 5a4852bc in ffmpeg

Timestamp:

Mar 6, 2014, 9:59:35 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

618d2262

Parents:

3ce85814 (diff), 570af382 (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> (03/06/14 21:58:46)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/06/14 21:59:35)

Message:

Merge commit '570af382eea902afe09f3562e5e1b483981cca7e'

• commit '570af382eea902afe09f3562e5e1b483981cca7e': mxf: Handle identification metadata

Conflicts:

libavformat/mxfdec.c

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

(No files)