[FFmpeg-cvslog] Merge commit '3d624420086ed3cd0c74f4510f0285968e21c117'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  1 12:09:07 2013 +0200| [1924a61a0a39dfb216f09a6d4d3cb9a1f8a758b4] | committer: Michael Niedermayer

Merge commit '3d624420086ed3cd0c74f4510f0285968e21c117'

* commit '3d624420086ed3cd0c74f4510f0285968e21c117':
  avconv_opt: allocate an OutputFile before the streams.

Conflicts:
	ffmpeg_opt.c

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

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