Changeset 3ce85814 in ffmpeg

Timestamp:

Mar 6, 2014, 9:50:06 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5a4852bc

Parents:

22652123 (diff), 5b930092 (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:39:18)

git-committer:

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

Message:

Merge commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416'

• commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416': mxf: Set audio packets pts

Conflicts:

libavformat/mxfdec.c

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

(No files)