]> git.sesse.net Git - ffmpeg/commit
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)
commit4131a3cb58d93435acdbeda82957e42fcab41e07
tree2886a8dc36e324285b10196a417e6270cd1271aa
parent46cc498b77bcb058823687fc98fa6beb290324c0
parent8583b14252deac71136f1dec231910abab0ba503
Merge commit '8583b14252deac71136f1dec231910abab0ba503'

* commit '8583b14252deac71136f1dec231910abab0ba503':
  rtmp: Support reading interleaved chunks.

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