diff options
author | Michael Niedermayer <[email protected]> | 2014-05-18 14:30:43 +0200 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2014-05-18 14:38:36 +0200 |
commit | 8334850a9985dde0e11227902fb007b382aa97e6 (patch) | |
tree | 1d3e645a286dc2bc3280146c1751b7a6ec768f74 /tests/utils.c | |
parent | 8636b11bdc6ecd7c486d3463a7dcb22b0c0a9ba7 (diff) | |
parent | 93afb6c98df876b15e3d911a9450ad55f92080ce (diff) |
Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'
* commit '93afb6c98df876b15e3d911a9450ad55f92080ce':
avconv: set output avg_frame_rate when known
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'tests/utils.c')
0 files changed, 0 insertions, 0 deletions