diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-11 15:01:15 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-11 15:01:15 +0100 |
commit | 51a3e525935efc60d8d23050f0daafeb82a3df57 (patch) | |
tree | 1d1ae3a561de848f27507ec3c08f8a5984ee10f2 /libavformat/matroskadec.c | |
parent | 1b86a6bb2cea5038a546a35d8ea844cf5487081a (diff) | |
parent | 1339009c4924a20e872aa62897097bf5d071157c (diff) | |
download | ffmpeg-51a3e525935efc60d8d23050f0daafeb82a3df57.tar.gz |
Merge commit '1339009c4924a20e872aa62897097bf5d071157c'
* commit '1339009c4924a20e872aa62897097bf5d071157c':
vf_showinfo: show timebase & framerate too
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/matroskadec.c')
0 files changed, 0 insertions, 0 deletions