Changeset 618d2262 in ffmpeg

Timestamp:

Mar 6, 2014, 10:45:05 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

39f5003a

Parents:

5a4852bc (diff), f06f6daa (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 22:44:29)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/06/14 22:45:05)

Message:

Merge commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6'

• commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6': mxf: Parse random index pack

Conflicts:

libavformat/mxfdec.c

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

(No files)