Changeset 999a99c8 in ffmpeg

Timestamp:
May 19, 2014, 4:38:10 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
4a2fd251
Parents:
e3c1d9a5 (diff), a312f710 (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 'a312f71090ee620ee252f2034aef6b13e2dafe9c'

Conflicts:

libavformat/mux.c
libavformat/version.h

mostly not merged as the code is needed for a/vsync drop handling
and what the code does is what is needed, it could maybe be moved
elsewhere or factored somehow but simply removing it would be droping
these features.

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.