virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
document rtsp.h" mailinglist thread.

Originally committed as revision 17381 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje 2009-02-16 16:27:35 +00:00
parent b4314bff6b
commit 2a1d51c573
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/rtsp.c
View File

@ -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);

6
libavformat/rtsp.h
View File

@ -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 {
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 {