[FFmpeg-cvslog] Merge commit '4d40e073dcdef335215c124d340ea156bc4bdf13'

Michael Niedermayer git at videolan.org
Mon Apr 14 14:40:45 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 14 14:31:50 2014 +0200| [b11265c9891e90187ed44c7dbfc84ec4305782d0] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b11265c9891e90187ed44c7dbfc84ec4305782d0
---





More information about the ffmpeg-cvslog mailing list