[FFmpeg-cvslog] r15962 - in trunk/libavformat: rdt.c rdt.h rtsp.c

[rbultje]

Author: rbultje
Date: Sun Nov 30 21:39:16 2008
New Revision: 15962

Log:
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.



Modified:
   trunk/libavformat/rdt.c
   trunk/libavformat/rdt.h
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rdt.c
==============================================================================
--- trunk/libavformat/rdt.c	(original)
+++ trunk/libavformat/rdt.c	Sun Nov 30 21:39:16 2008
@@ -45,7 +45,7 @@ struct RDTDemuxContext {
 };
 
 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 @@ ff_rdt_parse_open(AVFormatContext *ic, A
         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;

Modified: trunk/libavformat/rdt.h
==============================================================================
--- trunk/libavformat/rdt.h	(original)
+++ trunk/libavformat/rdt.h	Sun Nov 30 21:39:16 2008
@@ -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);

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	(original)
+++ trunk/libavformat/rtsp.c	Sun Nov 30 21:39:16 2008
@@ -901,7 +901,7 @@ rtsp_open_transport_ctx(AVFormatContext 
         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