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)
commit4abd5a431823e4f816c2295d9086b725df1f0358
tree9959c95f53d5b5decc0040349c0469fb87cfea79
parent2280b539c5050364d68e2cdbef2a0d3a7047544f
parent274e134e49b1c92db0f0b8cb2ae7554fb7b9184c
Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c'

* commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c':
  avconv: check that the output format context exists before accessing it

Conflicts:
ffmpeg.c

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