]> git.sesse.net Git - nageru/commitdiff
Remove an unneeded nullptr check.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 21 Dec 2018 21:38:42 +0000 (22:38 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 21 Dec 2018 21:38:42 +0000 (22:38 +0100)
Indirectly found by Coverity Scan.

nageru/mixer.cpp

index 3e1335e13ad6af79d6703d6f8f88cff52a0e3a7f..c25b22dc711fa528c2720493504f9bebcfe12f3b 100644 (file)
@@ -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);