Mercurial > libavformat.hg
diff rtpdec.c @ 6179:736165b749f8 libavformat
RTSP, rtpdec: Move RTPPayloadData into rtpdec_mpeg4 and remove all references to rtp_payload_data in rtpdec and rtsp
Patch by Josh Allmann, joshua dot allmann at gmail
author | mstorsjo |
---|---|
date | Fri, 25 Jun 2010 08:02:50 +0000 |
parents | 7aca26f37b02 |
children | c4c35a9d4ab5 |
line wrap: on
line diff
--- a/rtpdec.c Fri Jun 25 08:01:20 2010 +0000 +++ b/rtpdec.c Fri Jun 25 08:02:50 2010 +0000 @@ -315,9 +315,8 @@ * open a new RTP parse context for stream 'st'. 'st' can be NULL for * MPEG2TS streams to indicate that they should be demuxed inside the * rtp demux (otherwise CODEC_ID_MPEG2TS packets are returned) - * TODO: change this to not take rtp_payload data, and use the new dynamic payload system. */ -RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *rtpc, int payload_type, RTPPayloadData *rtp_payload_data) +RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *rtpc, int payload_type) { RTPDemuxContext *s; @@ -329,7 +328,6 @@ s->first_rtcp_ntp_time = AV_NOPTS_VALUE; s->ic = s1; s->st = st; - s->rtp_payload_data = rtp_payload_data; rtp_init_statistics(&s->statistics, 0); // do we know the initial sequence from sdp? if (!strcmp(ff_rtp_enc_name(payload_type), "MP2T")) { s->ts = ff_mpegts_parse_open(s->ic); @@ -528,9 +526,6 @@ void rtp_parse_close(RTPDemuxContext *s) { - // TODO: fold this into the protocol specific data fields. - av_free(s->rtp_payload_data->mode); - av_free(s->rtp_payload_data->au_headers); if (!strcmp(ff_rtp_enc_name(s->payload_type), "MP2T")) { ff_mpegts_parse_close(s->ts); }