From d8f0deadc3533ad0f5b3aef8c2da5a3192f658b7 Mon Sep 17 00:00:00 2001
From: Jan Schmidt <jan@centricular.com>
Date: Sat, 9 May 2020 03:09:03 +1000
Subject: [PATCH] deinterlace: Split out NULL checks in yadif

Separate out explicit NULL checks for fields we depend on so
that coverity can hopefully verify dependencies better.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/585>
---
 gst/deinterlace/yadif.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gst/deinterlace/yadif.c b/gst/deinterlace/yadif.c
index fee0e6aad0..160e9ac094 100644
--- a/gst/deinterlace/yadif.c
+++ b/gst/deinterlace/yadif.c
@@ -290,11 +290,12 @@ filter_scanline_yadif (GstDeinterlaceSimpleMethod * self,
       || s.bbp == NULL) ? 2 : 0;
 
   /* When starting up, some data might not yet be available, so use the current frame */
-  if (s.m1 == NULL) {
-    s.tt1 = s.ttp;
+  if (s.m1 == NULL)
     s.m1 = s.mp;
+  if (s.tt1 == NULL)
+    s.tt1 = s.ttp;
+  if (s.bb1 == NULL)
     s.bb1 = s.bbp;
-  }
   if (s.t2 == NULL)
     s.t2 = s.tp2;
   if (s.b2 == NULL)