Changeset 84ca7c28 in ffmpeg

Timestamp:

Jan 14, 2014, 9:03:32 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e3c0fcad

Parents:

d938a013 (diff), f5fbbbc0 (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 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a'

• commit 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a': mxf: Drop unnecessary checks

Conflicts:

libavformat/mxfdec.c

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

(No files)