[FFmpeg-cvslog] Merge commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 10 21:44:17 2014 +0200| [d246397161bb68f12dcb03bbd4f2d315748914fb] | committer: Michael Niedermayer

Merge commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119'

* commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119':
  tls: Support passing old-style tcp options

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

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