-
Michael Niedermayer authored
* commit '3f3232a3': avconv: set the output stream timebase Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
8e7c8325
* commit '3f3232a3': avconv: set the output stream timebase Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>