[FFmpeg-cvslog] Merge commit '56f98e340fca894a76d1ddbe33118b8d8c4db34a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul 26 23:28:36 2014 +0200| [371cb96414bb77edaf0333ff818be88f0092a094] | committer: Michael Niedermayer

Merge commit '56f98e340fca894a76d1ddbe33118b8d8c4db34a'

* commit '56f98e340fca894a76d1ddbe33118b8d8c4db34a':
  output example: convert audio to the format supported by the encoder

Conflicts:
	doc/examples/muxing.c

Not merged as our example code already does that for what is needed
and we generate matching data for the rest. generating fixed data
and converting all parameters could be done of course.

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

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