Merge commit '274e134e'
* commit '274e134e': avconv: check that the output format context exists before accessing it Conflicts: ffmpeg.c Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '274e134e': avconv: check that the output format context exists before accessing it Conflicts: ffmpeg.c Merged-by:Michael Niedermayer <michaelni@gmx.at>