Commit b11265c9 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '4d40e073'

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

Conflicts:
	libavformat/rtmpproto.c

See: 36b9c27dMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 36b9c27d 4d40e073
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment