Merge commit '3d624420086ed3cd0c74f4510f0285968e21c117'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 May 2013 10:09:07 +0000 (12:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 May 2013 10:09:07 +0000 (12:09 +0200)
commit1924a61a0a39dfb216f09a6d4d3cb9a1f8a758b4
tree6c48c88fbca967a08bd43c8ceae6dc8234713f2e
parent3319679d0a36bec3e78f639d6f9fbbe596f6eec3
parent3d624420086ed3cd0c74f4510f0285968e21c117
Merge commit '3d624420086ed3cd0c74f4510f0285968e21c117'

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

Conflicts:
ffmpeg_opt.c

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