[FFmpeg-cvslog] Merge commit '24fee95321c1463360ba7042d026dae021854360'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct  4 14:18:22 2013 +0200| [b8e44118b13614f74c13a5540fdac4a5f097b70d] | committer: Michael Niedermayer

Merge commit '24fee95321c1463360ba7042d026dae021854360'

* commit '24fee95321c1463360ba7042d026dae021854360':
  rtmpproto: Move the flv header/trailer addition to append_flv_data

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

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