[FFmpeg-cvslog] Merge commit 'ab7b038906f3e40ed474676d8e3029902a2078f5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 19 13:50:33 2015 +0200| [15fbf3e72a643b6b3d32ab6fa687ca2ca3d2fde1] | committer: Michael Niedermayer

Merge commit 'ab7b038906f3e40ed474676d8e3029902a2078f5'

* commit 'ab7b038906f3e40ed474676d8e3029902a2078f5':
  avconv: factor out the output stream initialization

Conflicts:
	ffmpeg.c

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

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