-
Michael Niedermayer authored
* commit '5c79d2e1': avconv: Do not divide by zero Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
f2387152
* commit '5c79d2e1': avconv: Do not divide by zero Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>