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)
* commit '3b18857ab301d2a0b3e86e9d85eed76f0798a29c':
  rtmppkt: Add method to read an AMF string that is not prefixed by its type

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtmppkt.c
libavformat/rtmppkt.h

Simple merge
Simple merge