From bfbffbd7d8fd014a3693c51d7cde9926315a9fa0 Mon Sep 17 00:00:00 2001 From: rogerdpack Date: Fri, 17 Jun 2016 14:04:34 -0600 Subject: [PATCH] dshow: avoid duplicate NULL check before free Signed-off-by: rogerdpack Signed-off-by: Michael Niedermayer --- libavdevice/dshow.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index a60e7c1c1a..f2453e6114 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -104,14 +104,10 @@ dshow_read_close(AVFormatContext *s) if (ctx->device_filter[AudioDevice]) IBaseFilter_Release(ctx->device_filter[AudioDevice]); - if (ctx->device_name[0]) - av_freep(&ctx->device_name[0]); - if (ctx->device_name[1]) - av_freep(&ctx->device_name[1]); - if (ctx->device_unique_name[0]) - av_freep(&ctx->device_unique_name[0]); - if (ctx->device_unique_name[1]) - av_freep(&ctx->device_unique_name[1]); + av_freep(&ctx->device_name[0]); + av_freep(&ctx->device_name[1]); + av_freep(&ctx->device_unique_name[0]); + av_freep(&ctx->device_unique_name[1]); if(ctx->mutex) CloseHandle(ctx->mutex);