Merge commit '647d655d19c38e9716328e4787199149097d6089'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Sep 2013 09:00:47 +0000 (11:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Sep 2013 09:00:51 +0000 (11:00 +0200)
* commit '647d655d19c38e9716328e4787199149097d6089':
  rtmpproto: Consistently use the right prev_pkt array

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

Simple merge