[FFmpeg-cvslog] Merge remote-tracking branch 'lukaszmluki/master'

Michael Niedermayer git at videolan.org
Sat Oct 12 14:19:27 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 12 14:14:48 2013 +0200| [8de021fabe3a1c7a1465d5fa6e238803a3d82f04] | committer: Michael Niedermayer

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  avformat/ftp: add log regarding passive mode failure
  avformat/ftp: fix possible deadlock
  avdevice/pulse_audio_enc: fix stream index

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

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





More information about the ffmpeg-cvslog mailing list