[FFmpeg-cvslog] Merge commit '1da54e908eba73eb86f5d614c51f06811c85c3ea'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 20:58:45 2013 +0100| [49e87819d09e4c7a7bbbfa19dff12c2d0db29584] | committer: Michael Niedermayer

Merge commit '1da54e908eba73eb86f5d614c51f06811c85c3ea'

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

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

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