[FFmpeg-cvslog] Merge commit '647d655d19c38e9716328e4787199149097d6089'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 18 11:00:47 2013 +0200| [e81411e88e1c6614099c7478b4382523601d0740] | committer: Michael Niedermayer

Merge commit '647d655d19c38e9716328e4787199149097d6089'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e81411e88e1c6614099c7478b4382523601d0740
---