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/rtsp.h | |
| parent | 544f8114534457e2d2ea04aaffa3b4986d6c8130 (diff) | |
| parent | 8b2e9636c57b22582143467a8a06b509b47b92f9 (diff) | |
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/rtsp.h')
| -rw-r--r-- | libavformat/rtsp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index d159793835..a9f2f1e125 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -70,6 +70,7 @@ enum RTSPControlTransport { }; #define RTSP_DEFAULT_PORT 554 +#define RTSPS_DEFAULT_PORT 322 #define RTSP_MAX_TRANSPORTS 8 #define RTSP_TCP_MAX_PACKET_SIZE 1472 #define RTSP_DEFAULT_NB_AUDIO_CHANNELS 1 |