From 8d128f8bf5ceb9a7a74e8153e0434596989698f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 10 May 2016 09:38:28 +0100 Subject: [PATCH] decklinkvideosrc: remove unnecessary checks for non-NULL frame We can't get a NULL frame here. CID 1359923 --- sys/decklink/gstdecklinkvideosrc.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/decklink/gstdecklinkvideosrc.cpp b/sys/decklink/gstdecklinkvideosrc.cpp index 5dc69e56a0..8854c1b6c3 100644 --- a/sys/decklink/gstdecklinkvideosrc.cpp +++ b/sys/decklink/gstdecklinkvideosrc.cpp @@ -550,9 +550,10 @@ gst_decklink_video_src_create (GstPushSrc * bsrc, GstBuffer ** buffer) f = (CaptureFrame *) g_queue_pop_head (&self->current_frames); g_mutex_unlock (&self->lock); + g_assert (f != NULL); + if (self->flushing) { - if (f) - capture_frame_free (f); + capture_frame_free (f); GST_DEBUG_OBJECT (self, "Flushing"); return GST_FLOW_FLUSHING; } @@ -566,8 +567,7 @@ gst_decklink_video_src_create (GstPushSrc * bsrc, GstBuffer ** buffer) self->caps_mode = f->mode; } else { g_mutex_unlock (&self->lock); - if (f) - capture_frame_free (f); + capture_frame_free (f); GST_ELEMENT_ERROR (self, CORE, NEGOTIATION, ("Invalid mode in captured frame"), ("Mode set to %d but captured %d", self->caps_mode, f->mode)); @@ -582,8 +582,7 @@ gst_decklink_video_src_create (GstPushSrc * bsrc, GstBuffer ** buffer) self->caps_format = f->format; } else { g_mutex_unlock (&self->lock); - if (f) - capture_frame_free (f); + capture_frame_free (f); GST_ELEMENT_ERROR (self, CORE, NEGOTIATION, ("Invalid pixel format in captured frame"), ("Format set to %d but captured %d", self->caps_format, f->format));