Merge commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 10:57:33 +0000 (11:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 10:57:33 +0000 (11:57 +0100)
commit42a095d095b597dd855d843138bfda2d4ea36368
treeb8846b0dde3dd5a39c89e05884a594904c5c2ed3
parenta105c1f204bd820246a18b6af6d85f5a4839e000
parent3c3b8003a13d9c3668c0bb6d79d2376da3b2b352
Merge commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352'

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

Conflicts:
libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtmpproto.c