Merge commit '44127b157e9f8acb837d4bb3a094f56b40da3ef5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 11:14:10 +0000 (12:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 11:14:26 +0000 (12:14 +0100)
commit900fff89c9ede6ecd549397384007890fd8c8c6c
treeb834396f9fba03d550e6b0eccee9dc0d2c2496ec
parent42a095d095b597dd855d843138bfda2d4ea36368
parent44127b157e9f8acb837d4bb3a094f56b40da3ef5
Merge commit '44127b157e9f8acb837d4bb3a094f56b40da3ef5'

* commit '44127b157e9f8acb837d4bb3a094f56b40da3ef5':
  rtmppkt: Make pkt->data reallocable

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