diff options
| author | Michael Niedermayer <[email protected]> | 2015-07-19 13:33:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-07-19 13:33:44 +0200 |
| commit | edd110ee4526849da487bb6be9c63fc77cb5a65a (patch) | |
| tree | 4c0b9bd163f24be2ede535cc91dc6382bc006b24 /ffmpeg.c | |
| parent | 247f4d1f181c2801b8321a7ddb88818dc4861155 (diff) | |
| parent | bd2ab27c488ae92c7820efe11d4f53d84e94d58e (diff) | |
Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e'
* commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e':
avconv: use read_file() for reading the 2pass stats
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions