From f32e546b94f234da5bb047db4e41a586de2da95a Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 28 Jan 2021 10:18:22 -0500 Subject: [PATCH] Remove unused members --- src/zm_ffmpeg_camera.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/zm_ffmpeg_camera.h b/src/zm_ffmpeg_camera.h index 450c0c95e..80fd6f260 100644 --- a/src/zm_ffmpeg_camera.h +++ b/src/zm_ffmpeg_camera.h @@ -47,16 +47,8 @@ class FfmpegCamera : public Camera { int frameCount; - int alignment; /* ffmpeg wants line sizes to be 32bit aligned. Especially 4.3+ */ - -#if HAVE_LIBAVFORMAT - AVFrame *mRawFrame; - AVFrame *mFrame; _AVPIXELFORMAT imagePixFormat; - AVFrame *input_frame; // Use to point to mRawFrame or hwFrame; - - AVFrame *hwFrame; // Will also be used to indicate if hwaccel is in use bool use_hwaccel; //will default to on if hwaccel specified, will get turned off if there is a failure #if HAVE_LIBAVUTIL_HWCONTEXT_H AVBufferRef *hw_device_ctx = nullptr; @@ -70,12 +62,10 @@ class FfmpegCamera : public Camera { int OpenFfmpeg(); int Close(); bool mCanCapture; -#endif // HAVE_LIBAVFORMAT #if HAVE_LIBSWSCALE struct SwsContext *mConvertContext; #endif - uint8_t *frame_buffer; int error_count; @@ -109,6 +99,5 @@ class FfmpegCamera : public Camera { int PostCapture(); private: static int FfmpegInterruptCallback(void*ctx); - int transfer_to_image(Image &i, AVFrame *output_frame, AVFrame *input_frame); }; #endif // ZM_FFMPEG_CAMERA_H