diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index e627149c9..0c84844b3 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -1807,7 +1807,7 @@ bool Monitor::Analyse() { } else { event->addNote(SIGNAL_CAUSE, "Reacquired"); } - if (0 and snap->in_frame && ( + if (snap->in_frame && ( ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P) || ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P) @@ -1898,7 +1898,7 @@ bool Monitor::Analyse() { // decoder may not have been able to provide an image if (!ref_image.Buffer()) { Debug(1, "Assigning instead of Detecting"); - if (0 and snap->in_frame && ( + if (snap->in_frame && ( ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P) || ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P) @@ -1914,7 +1914,7 @@ bool Monitor::Analyse() { } else if (!(analysis_image_count % (motion_frame_skip+1))) { Debug(1, "Detecting motion on image %d, image %p", snap->image_index, snap->image); // Get new score. - if (0 and snap->in_frame && ( + if (snap->in_frame && ( ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P) || ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P) @@ -2138,7 +2138,7 @@ bool Monitor::Analyse() { if ((analysing == ANALYSING_ALWAYS) and snap->image) { if (!ref_image.Buffer()) { - if (0 and snap->in_frame && ( + if (snap->in_frame && ( ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P) || ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P) @@ -2151,7 +2151,7 @@ bool Monitor::Analyse() { ref_image.Assign(*(snap->image)); } } else { - if (0 and snap->in_frame && + if (snap->in_frame && ( ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P) ||