From: Steinar H. Gunderson Date: Fri, 21 Dec 2018 21:38:42 +0000 (+0100) Subject: Remove an unneeded nullptr check. X-Git-Tag: 1.8.1~53 X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=647810a468e01fab5d7f0fcd122565ab000a2e73 Remove an unneeded nullptr check. Indirectly found by Coverity Scan. --- diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp index 3e1335e..c25b22d 100644 --- a/nageru/mixer.cpp +++ b/nageru/mixer.cpp @@ -798,7 +798,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, size_t cbcr_width, cbcr_height, cbcr_offset, y_offset; size_t expected_length = video_format.stride * (video_format.height + video_format.extra_lines_top + video_format.extra_lines_bottom); - if (userdata != nullptr && userdata->pixel_format == PixelFormat_8BitYCbCrPlanar) { + if (userdata->pixel_format == PixelFormat_8BitYCbCrPlanar) { // The calculation above is wrong for planar Y'CbCr, so just override it. assert(card->type == CardType::FFMPEG_INPUT); assert(video_offset == 0);