[FFmpeg-cvslog] Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun  5 12:20:26 2013 +0200| [4abd5a431823e4f816c2295d9086b725df1f0358] | committer: Michael Niedermayer

Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c'

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

Conflicts:
	ffmpeg.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4abd5a431823e4f816c2295d9086b725df1f0358
---