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)
commite81411e88e1c6614099c7478b4382523601d0740
tree350babee477e751af44b4cb1a74d51b4eda130fb
parent7742edc03b3cd2cc72b293ae22d1f6cdfe0943f0
parent647d655d19c38e9716328e4787199149097d6089
Merge commit '647d655d19c38e9716328e4787199149097d6089'

* commit '647d655d19c38e9716328e4787199149097d6089':
  rtmpproto: Consistently use the right prev_pkt array

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