[FFmpeg-cvslog] avdevice/dshow: Remove unneeded NULL checks

Michael Niedermayer git at videolan.org
Sun Dec 28 18:46:18 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 28 18:17:12 2014 +0100| [9c3a8693a20da3ad89a327bf778e13c2cd74c81c] | committer: Michael Niedermayer

avdevice/dshow: Remove unneeded NULL checks

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

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

 libavdevice/dshow.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
index b20eab6..f326ca2 100644
--- a/libavdevice/dshow.c
+++ b/libavdevice/dshow.c
@@ -294,8 +294,7 @@ dshow_cycle_devices(AVFormatContext *avctx, ICreateDevEnum *devenum,
         }
 
 fail1:
-        if (buf)
-            av_free(buf);
+        av_free(buf);
         if (bag)
             IPropertyBag_Release(bag);
         IMoniker_Release(m);
@@ -458,8 +457,7 @@ next:
     }
 end:
     IAMStreamConfig_Release(config);
-    if (caps)
-        av_free(caps);
+    av_free(caps);
     if (pformat_set)
         *pformat_set = format_set;
 }



More information about the ffmpeg-cvslog mailing list