[FFmpeg-cvslog] Merge commit '5b2ad78f97d43299adcb038c04346999fe9b196c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  7 12:52:59 2014 +0100| [d540e7577a4cfdb166d0287b619c30969ca749b4] | committer: Michael Niedermayer

Merge commit '5b2ad78f97d43299adcb038c04346999fe9b196c'

* commit '5b2ad78f97d43299adcb038c04346999fe9b196c':
  rtmppkt: Handle extended timestamp field even for one-byte header

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

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