[FFmpeg-cvslog] Merge commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 26 23:00:36 2014 +0200| [b9bfd888e551644c54971220ebf1f37effba4769] | committer: Michael Niedermayer

Merge commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb'

* commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb':
  output example: use OutputStream for audio streams as well

Conflicts:
	doc/examples/muxing.c

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

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