Commit 1262d638 authored by Ronald S. Bultje's avatar Ronald S. Bultje

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
parent f52901b3
......@@ -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;
......
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