Merge commit '84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Oct 2013 13:31:05 +0000 (15:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Oct 2013 13:31:11 +0000 (15:31 +0200)
* commit '84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c':
  rtmp: Allocate the prev_pkt arrays dynamically

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

Simple merge
Simple merge
Simple merge