[FFmpeg-cvslog] Merge commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a' into release/2.2

Michael Niedermayer git at videolan.org
Sun May 4 21:26:28 CEST 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun May  4 20:54:43 2014 +0200| [8c5897632a326c1d797f0bd45f97e0c83683412c] | committer: Michael Niedermayer

Merge commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a' into release/2.2

* commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a':
  rtmpproto: Make sure to pass on the error code if read_connect failed

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list