[FFmpeg-cvslog] rtsp: Use ff_rtsp_undo_setup in the cleanup code in ff_rtsp_make_request

Martin Storsjo git
Wed Jan 26 04:01:15 CET 2011


ffmpeg | branch: master | Martin Storsjo <martin at martin.st> | Mon Jan 24 09:49:03 2011 +0000| [3f44e3c91ab2a4737c9790bc4fe2362ff1ea2e0a] | committer: Michael Niedermayer

rtsp: Use ff_rtsp_undo_setup in the cleanup code in ff_rtsp_make_request

Signed-off-by: Janne Grunau <janne-ffmpeg at jannau.net>
(cherry picked from commit aeb2de1c82f95b74e184992a10523606f4b341fa)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f44e3c91ab2a4737c9790bc4fe2362ff1ea2e0a
---

 libavformat/rtsp.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index dcceb68..dddaaf4 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1271,12 +1271,7 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port,
     return 0;
 
 fail:
-    for (i = 0; i < rt->nb_rtsp_streams; i++) {
-        if (rt->rtsp_streams[i]->rtp_handle) {
-            url_close(rt->rtsp_streams[i]->rtp_handle);
-            rt->rtsp_streams[i]->rtp_handle = NULL;
-        }
-    }
+    ff_rtsp_undo_setup(s);
     return err;
 }
 




More information about the ffmpeg-cvslog mailing list