diff options
| author | Michael Niedermayer <[email protected]> | 2014-07-09 21:44:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-07-09 21:44:25 +0200 |
| commit | 8e7c8325d202d7cd59cfab4172760a3a5c3799ed (patch) | |
| tree | 9d879fda5a5ffd0b8fb31246538ecec37e562761 /libavfilter/drawutils.c | |
| parent | 4b13ec69c6a23dd25d048bb129fadba131849cf9 (diff) | |
| parent | 3f3232a371cc88696184d9aef1f812656264e56c (diff) | |
Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'
* commit '3f3232a371cc88696184d9aef1f812656264e56c':
avconv: set the output stream timebase
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavfilter/drawutils.c')
0 files changed, 0 insertions, 0 deletions