Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 10:20:26 +0000 (12:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 10:20:26 +0000 (12:20 +0200)
* commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c':
  avconv: check that the output format context exists before accessing it

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
ffmpeg.c

diff --cc ffmpeg.c
Simple merge