aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2009-02-04 17:17:20 +0000
committerRonald S. Bultje <rsbultje@gmail.com>2009-02-04 17:17:20 +0000
commit1262d638dab8a9502d77862a5abdfe85fc179e3a (patch)
treea818968c308fdd487acae122202f4121e5801405
parentf52901b305fd8d160e6ff589b5ba30cb9ecba08d (diff)
downloadffmpeg-1262d638dab8a9502d77862a5abdfe85fc179e3a.tar.gz
Move enum RTSPTransport up a bit, so that all fields that are assigned a value
of this type can be properly attributed as such (in this case, transport in the RTSPTransportField struct). See "[PATCH] RTSP-MS 10/15: ASF header parsing" thread on mailinglist. Originally committed as revision 16989 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/rtsp.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h
index ce010eca20..83d7626106 100644
--- a/libavformat/rtsp.h
+++ b/libavformat/rtsp.h
@@ -37,6 +37,12 @@ enum RTSPLowerTransport {
RTSP_LOWER_TRANSPORT_LAST
};
+enum RTSPTransport {
+ RTSP_TRANSPORT_RTP,
+ RTSP_TRANSPORT_RDT,
+ RTSP_TRANSPORT_LAST
+};
+
#define RTSP_DEFAULT_PORT 554
#define RTSP_MAX_TRANSPORTS 8
#define RTSP_TCP_MAX_PACKET_SIZE 1472
@@ -52,7 +58,7 @@ typedef struct RTSPTransportField {
int server_port_min, server_port_max; /**< RTP ports */
int ttl; /**< ttl value */
uint32_t destination; /**< destination IP address */
- int transport;
+ enum RTSPTransport transport;
enum RTSPLowerTransport lower_transport;
} RTSPTransportField;
@@ -82,12 +88,6 @@ enum RTSPServerType {
RTSP_SERVER_LAST
};
-enum RTSPTransport {
- RTSP_TRANSPORT_RTP,
- RTSP_TRANSPORT_RDT,
- RTSP_TRANSPORT_LAST
-};
-
typedef struct RTSPState {
URLContext *rtsp_hd; /* RTSP TCP connexion handle */
int nb_rtsp_streams;