diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 11:21:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 11:33:19 +0200 |
| commit | f31c36e552663b11c49431745b8e75a0d3000539 (patch) | |
| tree | 9072c709ffe783a8835dca5b450ea04e77a4cad2 /libavfilter/vf_smartblur.c | |
| parent | 689a1bd917d528c9a84cc1a998159eb31e98ea79 (diff) | |
| parent | 705b748e8d8612385c96428ae36ed0d42a170d93 (diff) | |
| download | ffmpeg-f31c36e552663b11c49431745b8e75a0d3000539.tar.gz | |
Merge commit '705b748e8d8612385c96428ae36ed0d42a170d93'
* commit '705b748e8d8612385c96428ae36ed0d42a170d93':
tls: Add support for listen mode
Conflicts:
doc/protocols.texi
libavformat/tls.c
libavformat/version.h
See: 4f4eb380f0f96dbb7cdd2b812fa92b8b47a0f27c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_smartblur.c')
0 files changed, 0 insertions, 0 deletions