Changeset ac293b66 in ffmpeg

Timestamp:

Jun 18, 2014, 5:49:17 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

75511c29

Parents:

88514378 (diff), 194be1f4 (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> (06/18/14 16:18:25)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/18/14 17:49:17)

Message:

Merge commit '194be1f43ea391eb986732707435176e579265aa'

• commit '194be1f43ea391eb986732707435176e579265aa': lavf: switch to AVStream.time_base as the hint for the muxer timebase

Conflicts:

doc/APIchanges
libavformat/filmstripenc.c
libavformat/movenc.c
libavformat/mxfenc.c
libavformat/oggenc.c
libavformat/swf.h
libavformat/version.h
tests/ref/lavf/mkv

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

(No files)