diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 12:48:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 12:58:55 +0200 |
| commit | bc59d39b824900bafb53bf174314a59c2491f2e3 (patch) | |
| tree | 91698562c76508c03f6c51fcf01aa8d25445aded /doc/ffprobe.texi | |
| parent | d9c4f61dab2a1994ae3220080583baab37cf2372 (diff) | |
| parent | 81eec081afea9fc017a175581ceea7c420a0dfc3 (diff) | |
| download | ffmpeg-bc59d39b824900bafb53bf174314a59c2491f2e3.tar.gz | |
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>
Diffstat (limited to 'doc/ffprobe.texi')
0 files changed, 0 insertions, 0 deletions