Merge commit '1da54e908eba73eb86f5d614c51f06811c85c3ea'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 19:58:45 +0000 (20:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 19:58:56 +0000 (20:58 +0100)
commit49e87819d09e4c7a7bbbfa19dff12c2d0db29584
tree5e8ccc2b1795589b981b90e3555ae418ba0b5972
parentcde1e7db3e67a8f7ed6e3389fae349ceb91e866d
parent1da54e908eba73eb86f5d614c51f06811c85c3ea
Merge commit '1da54e908eba73eb86f5d614c51f06811c85c3ea'

* commit '1da54e908eba73eb86f5d614c51f06811c85c3ea':
  avconv: use a local variable for OutputFile in open_output_file().

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