Merge commit '3b18857ab301d2a0b3e86e9d85eed76f0798a29c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 21:56:17 +0000 (23:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 21:56:22 +0000 (23:56 +0200)
commit6b9cbc9a1164988b3517f4f160f7937e1644cdc3
tree18f7678940d2fb685312ba02cfdd4101ece5ba69
parent8225bf95bc3ffc9757879d2eb092cf3fa9d6b26f
parent3b18857ab301d2a0b3e86e9d85eed76f0798a29c
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@gmx.at>
libavformat/rtmppkt.c
libavformat/rtmppkt.h