Merge commit '81eec081afea9fc017a175581ceea7c420a0dfc3'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 10:48:36 +0000 (12:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 10:58:55 +0000 (12:58 +0200)
commitbc59d39b824900bafb53bf174314a59c2491f2e3
tree91698562c76508c03f6c51fcf01aa8d25445aded
parentd9c4f61dab2a1994ae3220080583baab37cf2372
parent81eec081afea9fc017a175581ceea7c420a0dfc3
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>
libavformat/matroskaenc.c