-
Michael Niedermayer authored
* commit '2ce8bca5': avconv: print a warning when falling back to default 25fps Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
206c06d9
* commit '2ce8bca5': avconv: print a warning when falling back to default 25fps Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>