[FFmpeg-cvslog] Merge commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 28 11:57:33 2014 +0100| [42a095d095b597dd855d843138bfda2d4ea36368] | committer: Michael Niedermayer

Merge commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352'

* commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352':
  rtmpproto: Simplify code for copying data into the output packet

Conflicts:
	libavformat/rtmpproto.c

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

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