-
Michael Niedermayer authored
* commit '81eec081': matroskaenc: base DefaultDuration on the framerate, not the codec timebase Conflicts: libavformat/matroskaenc.c tests/ref/lavf/mkv tests/ref/seek/lavf-mkv See: ea83b032Merged-by:
Michael Niedermayer <michaelni@gmx.at>
bc59d39b