Merge commit '8583b14252deac71136f1dec231910abab0ba503'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Sep 2013 10:08:37 +0000 (12:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Sep 2013 10:09:06 +0000 (12:09 +0200)
* commit '8583b14252deac71136f1dec231910abab0ba503':
  rtmp: Support reading interleaved chunks.

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

Simple merge
Simple merge
Simple merge