Changeset 2ef6c0fd in ffmpeg

Timestamp:

Mar 19, 2014, 8:09:16 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9da88d5

Parents:

3e59db60 (diff), af9481d7 (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 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004'

• commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004': mxf: Lowercase UL strings

Conflicts:

libavformat/mxfdec.c

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

(No files)