[FFmpeg-cvslog] Merge commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 26 23:20:54 2014 +0200| [5a55d5e44575ea70c20dfea108c8cc038e1463c5] | committer: Michael Niedermayer

Merge commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb'

* commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb':
  output example: allocate the audio frame only once

Conflicts:
	doc/examples/muxing.c

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

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