From c832fabafdf8c9d10972bd043eded60298055ea8 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 7 Jan 2022 23:14:22 -0500 Subject: [PATCH] solve ccpcheck complaints --- src/zm_ffmpeg_input.cpp | 3 +-- src/zm_fifo_stream.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/zm_ffmpeg_input.cpp b/src/zm_ffmpeg_input.cpp index 17ce88eab..8e0a5b0e8 100644 --- a/src/zm_ffmpeg_input.cpp +++ b/src/zm_ffmpeg_input.cpp @@ -31,8 +31,7 @@ int FFmpeg_Input::Open( const AVStream * audio_in_stream, const AVCodecContext * audio_in_ctx ) { - video_stream_id = video_in_stream->index; - int max_stream_index = video_in_stream->index; + int max_stream_index = video_stream_id = video_in_stream->index; if ( audio_in_stream ) { max_stream_index = video_in_stream->index > audio_in_stream->index ? video_in_stream->index : audio_in_stream->index; diff --git a/src/zm_fifo_stream.h b/src/zm_fifo_stream.h index 911980d48..332275771 100644 --- a/src/zm_fifo_stream.h +++ b/src/zm_fifo_stream.h @@ -28,7 +28,6 @@ class FifoStream : public StreamBase { std::string stream_path; int total_read; int bytes_read; - unsigned int frame_count; protected: typedef enum { UNKNOWN, MJPEG, RAW } StreamType; @@ -39,9 +38,9 @@ class FifoStream : public StreamBase { public: FifoStream() : + StreamBase(), total_read(0), bytes_read(0), - frame_count(0), stream_type(UNKNOWN) {}