diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2009-02-16 16:27:35 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2009-02-16 16:27:35 +0000 |
| commit | 2a1d51c573ace12a677872c086b77e541981aaff (patch) | |
| tree | bc9c859dc005eb8d215233e02381ab473b35e5cc | |
| parent | b4314bff6b71ea0693b52ff78454770d5f17f91b (diff) | |
| download | ffmpeg-2a1d51c573ace12a677872c086b77e541981aaff.tar.gz | |
Rename RTSP_*_LAST to RTSP_*_NB in line with PIX_FMT_* in lavc. See "[PATCH]
document rtsp.h" mailinglist thread.
Originally committed as revision 17381 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/rtsp.c | 2 | ||||
| -rw-r--r-- | libavformat/rtsp.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 34f0924d7e..636adce656 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1097,7 +1097,7 @@ static int rtsp_read_header(AVFormatContext *s, } 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 */ snprintf(tcpname, sizeof(tcpname), "tcp://%s:%d", host, port); diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 6920b451f9..48df0feac8 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -31,13 +31,13 @@ enum RTSPLowerTransport { RTSP_LOWER_TRANSPORT_UDP = 0, RTSP_LOWER_TRANSPORT_TCP = 1, RTSP_LOWER_TRANSPORT_UDP_MULTICAST = 2, - RTSP_LOWER_TRANSPORT_LAST + RTSP_LOWER_TRANSPORT_NB }; enum RTSPTransport { RTSP_TRANSPORT_RTP, RTSP_TRANSPORT_RDT, - RTSP_TRANSPORT_LAST + RTSP_TRANSPORT_NB }; #define RTSP_DEFAULT_PORT 554 @@ -82,7 +82,7 @@ enum RTSPServerType { RTSP_SERVER_RTP, /**< Standards-compliant RTP-server */ RTSP_SERVER_REAL, /**< Realmedia-style server */ RTSP_SERVER_WMS, /**< Windows Media server */ - RTSP_SERVER_LAST + RTSP_SERVER_NB }; typedef struct RTSPState { |