]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42a095d 44127b1)
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)
* commit '44127b157e9f8acb837d4bb3a094f56b40da3ef5':
  rtmppkt: Make pkt->data reallocable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtmppkt.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/rtmppkt.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.