[FFmpeg-cvslog] r21911 - trunk/libavformat/rtsp.c

[rbultje]

Author: rbultje
Date: Sat Feb 20 00:10:19 2010
New Revision: 21911

Log:
Make rtsp_close_streams() take a AVFormatContext instead of a RTSPState
argument, so we can use AVFormatContext->* here in the future.

Patch by Martin Storsj? <$firstname $firstname st>.

Modified:
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Fri Feb 19 23:23:55 2010	(r21910)
+++ trunk/libavformat/rtsp.c	Sat Feb 20 00:10:19 2010	(r21911)
@@ -572,8 +572,9 @@ static int sdp_parse(AVFormatContext *s,
 }
 
 /* close and free RTSP streams */
-static void rtsp_close_streams(RTSPState *rt)
+static void rtsp_close_streams(AVFormatContext *s)
 {
+    RTSPState *rt = s->priv_data;
     int i;
     RTSPStream *rtsp_st;
 
@@ -1421,7 +1422,7 @@ redirect:
     }
     return 0;
  fail:
-    rtsp_close_streams(rt);
+    rtsp_close_streams(s);
     av_freep(&content);
     url_close(rt->rtsp_hd);
     if (reply->status_code >=300 && reply->status_code < 400) {
@@ -1759,7 +1760,7 @@ static int rtsp_read_close(AVFormatConte
              s->filename);
     rtsp_send_cmd_async(s, cmd);
 
-    rtsp_close_streams(rt);
+    rtsp_close_streams(s);
     url_close(rt->rtsp_hd);
     return 0;
 }
@@ -1839,14 +1840,13 @@ static int sdp_read_header(AVFormatConte
     }
     return 0;
 fail:
-    rtsp_close_streams(rt);
+    rtsp_close_streams(s);
     return err;
 }
 
 static int sdp_read_close(AVFormatContext *s)
 {
-    RTSPState *rt = s->priv_data;
-    rtsp_close_streams(rt);
+    rtsp_close_streams(s);
     return 0;
 }