-
Michael Niedermayer authored
* commit 'f759f66e': avconv: explicitly report when the muxing overhead is unknown Conflicts: ffmpeg.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
8a9878b4
* commit 'f759f66e': avconv: explicitly report when the muxing overhead is unknown Conflicts: ffmpeg.c Merged-by:Michael Niedermayer <michaelni@gmx.at>