diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-17 20:22:53 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-17 20:22:56 +0200 |
commit | 43c18fec6e7cee336b5cf3ea5b0c6503410d6b73 (patch) | |
tree | 78c7ba64d87fe903e90734b6f2a4a388201bb88b /ffplay.c | |
parent | f78bc96b7c1c74caf99a7139cf81ce1110404965 (diff) | |
parent | 584f88409062f7a134e7391887899e8e723ab6ff (diff) | |
download | ffmpeg-43c18fec6e7cee336b5cf3ea5b0c6503410d6b73.tar.gz |
Merge commit '584f88409062f7a134e7391887899e8e723ab6ff'
* commit '584f88409062f7a134e7391887899e8e723ab6ff':
riff: Pass block_align to estimate frame duration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions