[FFmpeg-cvslog] ffmpeg: remove unneeded NULL pointer check

Michael Niedermayer git at videolan.org
Fri Jan 9 16:55:01 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan  9 15:51:32 2015 +0100| [04091552616e6c5bea754ebbee26f77cb8ba416e] | committer: Michael Niedermayer

ffmpeg: remove unneeded NULL pointer check

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 ffmpeg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 0741eca..f9aa65f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -458,7 +458,7 @@ static void ffmpeg_cleanup(int ret)
     for (i = 0; i < nb_output_files; i++) {
         OutputFile *of = output_files[i];
         AVFormatContext *s = of->ctx;
-        if (s && s->oformat && !(s->oformat->flags & AVFMT_NOFILE) && s->pb)
+        if (s && s->oformat && !(s->oformat->flags & AVFMT_NOFILE))
             avio_closep(&s->pb);
         avformat_free_context(s);
         av_dict_free(&of->opts);



More information about the ffmpeg-cvslog mailing list