Merge commit '4d40e073dcdef335215c124d340ea156bc4bdf13'

Browse Source

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

Conflicts:
	libavformat/rtmpproto.c

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

pull/64/merge

Michael Niedermayer 11 years ago

parent 36b9c27dae 4d40e073dc

commit b11265c989

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available