Commit 4239993f authored by rbultje's avatar rbultje

Rename RTSP_*_LAST to RTSP_*_NB in line with PIX_FMT_* in lavc. See "[PATCH]

document rtsp.h" mailinglist thread.



git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17381 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent c5dd597e
...@@ -1097,7 +1097,7 @@ static int rtsp_read_header(AVFormatContext *s, ...@@ -1097,7 +1097,7 @@ static int rtsp_read_header(AVFormatContext *s,
} }
if (!lower_transport_mask) if (!lower_transport_mask)
lower_transport_mask = (1 << RTSP_LOWER_TRANSPORT_LAST) - 1; lower_transport_mask = (1 << RTSP_LOWER_TRANSPORT_NB) - 1;
/* open the tcp connexion */ /* open the tcp connexion */
snprintf(tcpname, sizeof(tcpname), "tcp://%s:%d", host, port); snprintf(tcpname, sizeof(tcpname), "tcp://%s:%d", host, port);
......
...@@ -31,13 +31,13 @@ enum RTSPLowerTransport { ...@@ -31,13 +31,13 @@ enum RTSPLowerTransport {
RTSP_LOWER_TRANSPORT_UDP = 0, RTSP_LOWER_TRANSPORT_UDP = 0,
RTSP_LOWER_TRANSPORT_TCP = 1, RTSP_LOWER_TRANSPORT_TCP = 1,
RTSP_LOWER_TRANSPORT_UDP_MULTICAST = 2, RTSP_LOWER_TRANSPORT_UDP_MULTICAST = 2,
RTSP_LOWER_TRANSPORT_LAST RTSP_LOWER_TRANSPORT_NB
}; };
enum RTSPTransport { enum RTSPTransport {
RTSP_TRANSPORT_RTP, RTSP_TRANSPORT_RTP,
RTSP_TRANSPORT_RDT, RTSP_TRANSPORT_RDT,
RTSP_TRANSPORT_LAST RTSP_TRANSPORT_NB
}; };
#define RTSP_DEFAULT_PORT 554 #define RTSP_DEFAULT_PORT 554
...@@ -82,7 +82,7 @@ enum RTSPServerType { ...@@ -82,7 +82,7 @@ enum RTSPServerType {
RTSP_SERVER_RTP, /**< Standards-compliant RTP-server */ RTSP_SERVER_RTP, /**< Standards-compliant RTP-server */
RTSP_SERVER_REAL, /**< Realmedia-style server */ RTSP_SERVER_REAL, /**< Realmedia-style server */
RTSP_SERVER_WMS, /**< Windows Media server */ RTSP_SERVER_WMS, /**< Windows Media server */
RTSP_SERVER_LAST RTSP_SERVER_NB
}; };
typedef struct RTSPState { typedef struct RTSPState {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment