diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 16:25:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 16:30:29 +0100 |
| commit | afa442c198fcbfe587887a4318d61e19539afc2d (patch) | |
| tree | e4ee4899f4ecb5eae12f1b25172e67bd016419f5 /ffmpeg.h | |
| parent | ecb5b9c098009787e02f6de9e2d3e1786531c2f2 (diff) | |
| parent | a220b07b0f971f88213aef012aea51af2800be62 (diff) | |
| download | ffmpeg-afa442c198fcbfe587887a4318d61e19539afc2d.tar.gz | |
Merge commit 'a220b07b0f971f88213aef012aea51af2800be62'
* commit 'a220b07b0f971f88213aef012aea51af2800be62':
avconv: split printing the final statistics into a separate function
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions