[libav-commits] avformat: simplify avformat_close_input

Luca Barbato git at libav.org
Fri Sep 14 14:26:32 CEST 2012


Module: libav
Branch: master
Commit: 4d1f443c3d579cf9495c7a289282634908f6a538

Author:    Luca Barbato <lu_zero at gentoo.org>
Committer: Luca Barbato <lu_zero at gentoo.org>
Date:      Mon Sep 10 07:07:56 2012 +0200

avformat: simplify avformat_close_input

avio_close checks by itself for NULL condition.

---

 libavformat/utils.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 81a4b34..3a829a9 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2709,8 +2709,8 @@ void avformat_close_input(AVFormatContext **ps)
         s->iformat->read_close(s);
     avformat_free_context(s);
     *ps = NULL;
-    if (pb)
-        avio_close(pb);
+
+    avio_close(pb);
 }
 
 AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c)



More information about the libav-commits mailing list