Changeset 23e48cd0 in ffmpeg

Timestamp:

Feb 2, 2014, 4:23:59 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

493f750e

Parents:

8fb67c10 (diff), c7166248 (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 'c716624853339ea4b1086a3957b334829370204c'

• commit 'c716624853339ea4b1086a3957b334829370204c': mxf: Read field dominance flag

Conflicts:

libavformat/mxfdec.c

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

(No files)