diff options
| author | Luca Abeni <lucabe72@email.it> | 2008-12-13 23:25:19 +0000 |
|---|---|---|
| committer | Luca Abeni <lucabe72@email.it> | 2008-12-13 23:25:19 +0000 |
| commit | be73a544af0b626f31c484d3f96e67d68f4175ea (patch) | |
| tree | 424e82be44c90b99d1c0239bb03508bc74f5029e /libavformat/rtsp.c | |
| parent | 1afe09d515065a568b9f09da0d542cd50c19dfa8 (diff) | |
| download | ffmpeg-be73a544af0b626f31c484d3f96e67d68f4175ea.tar.gz | |
Rename rtp_payload_data_t to avoid clashes with the POSIX namespace
Originally committed as revision 16115 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index df1ed8c7ab..134910c98c 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -89,7 +89,7 @@ typedef struct RTSPStream { struct in_addr sdp_ip; /* IP address (from SDP content - not used in RTSP) */ int sdp_ttl; /* IP TTL (from SDP content - not used in RTSP) */ int sdp_payload_type; /* payload type - only used in SDP */ - rtp_payload_data_t rtp_payload_data; /* rtp payload parsing infos from SDP */ + RTPPayloadData rtp_payload_data; /* rtp payload parsing infos from SDP */ RTPDynamicProtocolHandler *dynamic_handler; ///< Only valid if it's a dynamic protocol. (This is the handler structure) PayloadContext *dynamic_protocol_context; ///< Only valid if it's a dynamic protocol. (This is any private data associated with the dynamic protocol) @@ -294,12 +294,12 @@ typedef struct { #define ATTR_NAME_TYPE_STR 1 static const AttrNameMap attr_names[]= { - {"SizeLength", ATTR_NAME_TYPE_INT, offsetof(rtp_payload_data_t, sizelength)}, - {"IndexLength", ATTR_NAME_TYPE_INT, offsetof(rtp_payload_data_t, indexlength)}, - {"IndexDeltaLength", ATTR_NAME_TYPE_INT, offsetof(rtp_payload_data_t, indexdeltalength)}, - {"profile-level-id", ATTR_NAME_TYPE_INT, offsetof(rtp_payload_data_t, profile_level_id)}, - {"StreamType", ATTR_NAME_TYPE_INT, offsetof(rtp_payload_data_t, streamtype)}, - {"mode", ATTR_NAME_TYPE_STR, offsetof(rtp_payload_data_t, mode)}, + {"SizeLength", ATTR_NAME_TYPE_INT, offsetof(RTPPayloadData, sizelength)}, + {"IndexLength", ATTR_NAME_TYPE_INT, offsetof(RTPPayloadData, indexlength)}, + {"IndexDeltaLength", ATTR_NAME_TYPE_INT, offsetof(RTPPayloadData, indexdeltalength)}, + {"profile-level-id", ATTR_NAME_TYPE_INT, offsetof(RTPPayloadData, profile_level_id)}, + {"StreamType", ATTR_NAME_TYPE_INT, offsetof(RTPPayloadData, streamtype)}, + {"mode", ATTR_NAME_TYPE_STR, offsetof(RTPPayloadData, mode)}, {NULL, -1, -1}, }; @@ -331,7 +331,7 @@ static void sdp_parse_fmtp(AVStream *st, const char *p) RTSPStream *rtsp_st = st->priv_data; AVCodecContext *codec = st->codec; - rtp_payload_data_t *rtp_payload_data = &rtsp_st->rtp_payload_data; + RTPPayloadData *rtp_payload_data = &rtsp_st->rtp_payload_data; /* loop on each attribute */ while(rtsp_next_attr_and_value(&p, attr, sizeof(attr), value, sizeof(value))) |