diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 16:18:27 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 16:18:40 +0100 |
commit | 6e2d3ba0eea1592e182d87a3067ff5d485f2f383 (patch) | |
tree | 72bd5b43b6f9bfc2759ddf57ee0b3518191f1160 /libavformat/concatdec.c | |
parent | 206c06d96f68be737202c0fb554c13fb8b261133 (diff) | |
parent | 5ef11b8dcc054b230deb9b20493255c14a80597d (diff) | |
download | ffmpeg-6e2d3ba0eea1592e182d87a3067ff5d485f2f383.tar.gz |
Merge commit '5ef11b8dcc054b230deb9b20493255c14a80597d'
* commit '5ef11b8dcc054b230deb9b20493255c14a80597d':
yuv4mpeg: set average frame rate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/concatdec.c')
0 files changed, 0 insertions, 0 deletions