[FFmpeg-cvslog] Merge commit '1959351aecf09fc3e90208ff775f4849801dc13f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 19 14:01:06 2015 +0200| [3b0534efdcde122ace74196be8c22afd9b03c017] | committer: Michael Niedermayer

Merge commit '1959351aecf09fc3e90208ff775f4849801dc13f'

* commit '1959351aecf09fc3e90208ff775f4849801dc13f':
  avconv: move the no streams failure to open_output_file()

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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