Mercurial > libavformat.hg

changeset 5677:545f70d48943 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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>.
author rbultje
date Fri, 19 Feb 2010 23:10:19 +0000
parents 5eb579e14926
children 76cb8ea11c47
files rtsp.c
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/rtsp.c	Fri Feb 19 22:13:19 2010 +0000
+++ b/rtsp.c	Fri Feb 19 23:10:19 2010 +0000
@@ -572,8 +572,9 @@
 }
 
 /* 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 @@
     }
     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 @@
              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 @@
     }
     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;
 }