Changeset 95398aa9 in ffmpeg

Timestamp:

Jun 18, 2014, 3:28:10 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2d702822

Parents:

bd148ce0 (diff), f792d3c (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 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'

• commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228': lavf: add the notimestamps flag to the muxers missing it

Conflicts:

libavformat/adtsenc.c

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

(No files)