Changeset bc59d39 in ffmpeg

Timestamp:

May 29, 2014, 10:58:55 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a72df4da

Parents:

d9c4f61d (diff), 81eec081 (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> (05/29/14 10:48:36)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/29/14 10:58:55)

Message:

Merge commit '81eec081afea9fc017a175581ceea7c420a0dfc3'

• commit '81eec081afea9fc017a175581ceea7c420a0dfc3': matroskaenc: base DefaultDuration on the framerate, not the codec timebase

Conflicts:

libavformat/matroskaenc.c
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv

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

(No files)