Merge remote-tracking branch 'lukaszmluki/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Oct 2013 12:14:48 +0000 (14:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Oct 2013 12:14:54 +0000 (14:14 +0200)
commit8de021fabe3a1c7a1465d5fa6e238803a3d82f04
treec7233f8306d57a766d9e609c26963f3e712c01e1
parent23c8a3353bd948f4a69116124dc433c85909d86e
parent3a92ee59531611e1daa8f25b7b673c920781290f
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@gmx.at>