diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 21:18:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 21:18:41 +0200 |
| commit | c9791925a1bfad19d47a3ca611c5f1b602d67c16 (patch) | |
| tree | f7e6c58c71f1016923989bf224b4c3e1bc91a071 /libavformat/samidec.c | |
| parent | 544f8114534457e2d2ea04aaffa3b4986d6c8130 (diff) | |
| parent | 8b2e9636c57b22582143467a8a06b509b47b92f9 (diff) | |
| download | ffmpeg-c9791925a1bfad19d47a3ca611c5f1b602d67c16.tar.gz | |
Merge commit '8b2e9636c57b22582143467a8a06b509b47b92f9'
* commit '8b2e9636c57b22582143467a8a06b509b47b92f9':
rtsp: Support tls-encapsulated RTSP
Conflicts:
libavformat/rtsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/samidec.c')
0 files changed, 0 insertions, 0 deletions