From 85fb2af369e9ea8638beaf3a34865e3553329a02 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 21 Nov 2014 05:12:55 +0100
Subject: Remove some superfluous NULL checks

In all of these situations, NULL is logically not allowed, making the
checks redundant.

Coverity complained about accessing the pointers before checking them
for NULL later.
---
 player/command.c     | 3 +--
 player/configfiles.c | 2 +-
 player/video.c       | 3 ---
 3 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'player')

diff --git a/player/command.c b/player/command.c
index 10a779f638..30768e9b71 100644
--- a/player/command.c
+++ b/player/command.c
@@ -1969,8 +1969,7 @@ static int probe_deint_filters(struct MPContext *mpctx)
     if (check_output_format(mpctx, IMGFMT_VDPAU)) {
         char filter[80] = "vdpaupp:deint=yes";
         int pref = 0;
-        if (mpctx->video_out)
-            vo_control(mpctx->video_out, VOCTRL_GET_PREF_DEINT, &pref);
+        vo_control(mpctx->video_out, VOCTRL_GET_PREF_DEINT, &pref);
         pref = pref < 0 ? -pref : pref;
         if (pref > 0 && pref <= 4) {
             const char *types[] =
diff --git a/player/configfiles.c b/player/configfiles.c
index 75011eb9fa..2d966eb7f7 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -268,7 +268,7 @@ static bool needs_config_quoting(const char *s)
 {
     if (s[0] == '%')
         return true;
-    for (int i = 0; s && s[i]; i++) {
+    for (int i = 0; s[i]; i++) {
         unsigned char c = s[i];
         if (!mp_isprint(c) || mp_isspace(c) || c == '#' || c == '\'' || c == '"')
             return true;
diff --git a/player/video.c b/player/video.c
index f74bd4d9f5..506c7971a7 100644
--- a/player/video.c
+++ b/player/video.c
@@ -202,9 +202,6 @@ int reinit_video_filters(struct MPContext *mpctx)
     if (need_reconfig)
         filter_reconfig(mpctx, true);
 
-    if (!d_video->vfilter)
-        return 0;
-
     return d_video->vfilter->initialized;
 }
 
-- 
cgit v1.2.3