diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 21:44:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 22:28:49 +0200 |
| commit | d246397161bb68f12dcb03bbd4f2d315748914fb (patch) | |
| tree | e916028b83f1794063bfa30201d7b6ef923cb66a /libavformat/assenc.c | |
| parent | 76d1ffffd0b2433c44ac48b8939337294566218b (diff) | |
| parent | cd9d6399fd00f5aeacaa90cdc0b74c3570024119 (diff) | |
| download | ffmpeg-streaming-d246397161bb68f12dcb03bbd4f2d315748914fb.zip ffmpeg-streaming-d246397161bb68f12dcb03bbd4f2d315748914fb.tar.gz | |
Merge commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119'
* commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119':
tls: Support passing old-style tcp options
See: 4f4eb380f0f96dbb7cdd2b812fa92b8b47a0f27c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/assenc.c')
0 files changed, 0 insertions, 0 deletions
