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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  4 13:56:01 2013 +0200| [372e00793fe8b9a22cf9ebb8b1e1147db4ee4c6b] | committer: Michael Niedermayer

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  ftp: fix using uninitialized value

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

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