[FFmpeg-cvslog] Merge commit '3b18857ab301d2a0b3e86e9d85eed76f0798a29c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun  1 23:56:17 2014 +0200| [6b9cbc9a1164988b3517f4f160f7937e1644cdc3] | committer: Michael Niedermayer

Merge commit '3b18857ab301d2a0b3e86e9d85eed76f0798a29c'

* commit '3b18857ab301d2a0b3e86e9d85eed76f0798a29c':
  rtmppkt: Add method to read an AMF string that is not prefixed by its type

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

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