# HG changeset patch # User rbultje # Date 1228077556 0 # Node ID 7bc64c735f8b7489fa1fcc78c56ad8e2c0c15e85 # Parent 116a6910592c1a16c263e568965d4e476f4dec90 Change function prototype from taking an AVStream to taking an index to the stream itself, plus a name change to signify that there may be multiple AVStreams per RDT set. See discussion in "[PATCH] RDT/Realmedia patches #2" thread on ML. diff -r 116a6910592c -r 7bc64c735f8b rdt.c --- a/rdt.c Sat Nov 29 13:55:03 2008 +0000 +++ b/rdt.c Sun Nov 30 20:39:16 2008 +0000 @@ -45,7 +45,7 @@ }; RDTDemuxContext * -ff_rdt_parse_open(AVFormatContext *ic, AVStream *st, +ff_rdt_parse_open(AVFormatContext *ic, int first_stream_of_set_idx, void *priv_data, RTPDynamicProtocolHandler *handler) { RDTDemuxContext *s = av_mallocz(sizeof(RDTDemuxContext)); @@ -53,7 +53,7 @@ return NULL; s->ic = ic; - s->st = st; + s->st = ic->streams[first_stream_of_set_idx]; s->prev_set_id = -1; s->prev_timestamp = -1; s->parse_packet = handler->parse_packet; diff -r 116a6910592c -r 7bc64c735f8b rdt.h --- a/rdt.h Sat Nov 29 13:55:03 2008 +0000 +++ b/rdt.h Sun Nov 30 20:39:16 2008 +0000 @@ -28,7 +28,8 @@ typedef struct RDTDemuxContext RDTDemuxContext; -RDTDemuxContext *ff_rdt_parse_open(AVFormatContext *ic, AVStream *st, +RDTDemuxContext *ff_rdt_parse_open(AVFormatContext *ic, + int first_stream_of_set_idx, void *priv_data, RTPDynamicProtocolHandler *handler); void ff_rdt_parse_close(RDTDemuxContext *s); diff -r 116a6910592c -r 7bc64c735f8b rtsp.c --- a/rtsp.c Sat Nov 29 13:55:03 2008 +0000 +++ b/rtsp.c Sun Nov 30 20:39:16 2008 +0000 @@ -901,7 +901,7 @@ s->ctx_flags |= AVFMTCTX_NOHEADER; if (rt->transport == RTSP_TRANSPORT_RDT) - rtsp_st->tx_ctx = ff_rdt_parse_open(s, st, + rtsp_st->tx_ctx = ff_rdt_parse_open(s, st->index, rtsp_st->dynamic_protocol_context, rtsp_st->dynamic_handler); else