diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 15:48:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 15:52:50 +0100 |
| commit | 8a9878b4ff233abf59924355e5121cb03bbfb7cd (patch) | |
| tree | 640407b2a674f1321d9d52cf942e31b11438745b /ffmpeg.h | |
| parent | c31b3e3878e64c4d0e126024d3e4f6e2b6916d98 (diff) | |
| parent | f759f66e367bc62ed7738a51040f775b656a60d8 (diff) | |
| download | ffmpeg-8a9878b4ff233abf59924355e5121cb03bbfb7cd.tar.gz | |
Merge commit 'f759f66e367bc62ed7738a51040f775b656a60d8'
* commit 'f759f66e367bc62ed7738a51040f775b656a60d8':
avconv: explicitly report when the muxing overhead is unknown
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions