Merge commit '4d40e073dcdef335215c124d340ea156bc4bdf13'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Apr 2014 12:31:50 +0000 (14:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Apr 2014 12:32:08 +0000 (14:32 +0200)
commitb11265c9891e90187ed44c7dbfc84ec4305782d0
tree7b4f09c91b96c740dbb07b5b751682c6c64aae03
parent36b9c27dae452e10b4fff3d10f836160a5b8fbbd
parent4d40e073dcdef335215c124d340ea156bc4bdf13
Merge commit '4d40e073dcdef335215c124d340ea156bc4bdf13'

* commit '4d40e073dcdef335215c124d340ea156bc4bdf13':
  rtmpproto: Handle RTMP chunk size packets before the connect packet

Conflicts:
libavformat/rtmpproto.c

See: 36b9c27dae452e10b4fff3d10f836160a5b8fbbd
Merged-by: Michael Niedermayer <michaelni@gmx.at>