diff --git a/app/codec/ffmpeg/CMakeLists.txt b/app/codec/ffmpeg/CMakeLists.txt index a3d7a50d2..436598852 100644 --- a/app/codec/ffmpeg/CMakeLists.txt +++ b/app/codec/ffmpeg/CMakeLists.txt @@ -16,7 +16,6 @@ set(OLIVE_SOURCES ${OLIVE_SOURCES} - codec/ffmpeg/avframeptr.h codec/ffmpeg/ffmpegdecoder.h codec/ffmpeg/ffmpegdecoder.cpp codec/ffmpeg/ffmpegencoder.h diff --git a/app/codec/ffmpeg/avframeptr.h b/app/codec/ffmpeg/avframeptr.h deleted file mode 100644 index 5660fd4b2..000000000 --- a/app/codec/ffmpeg/avframeptr.h +++ /dev/null @@ -1,60 +0,0 @@ -/*** - - Olive - Non-Linear Video Editor - Copyright (C) 2020 Olive Team - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -***/ - -#ifndef AVFRAMEPTR_H -#define AVFRAMEPTR_H - -extern "C" { -#include -} - -#include -#include - -#include "common/define.h" - -namespace olive { - -class AVFrameWrapper { -public: - AVFrameWrapper() { - frame_ = av_frame_alloc(); - } - - virtual ~AVFrameWrapper() { - av_frame_free(&frame_); - } - - DISABLE_COPY_MOVE(AVFrameWrapper) - - inline AVFrame* frame() const { - return frame_; - } - -private: - AVFrame* frame_; - -}; - -using AVFramePtr = std::shared_ptr; - -} - -#endif // AVFRAMEPTR_H diff --git a/app/codec/ffmpeg/ffmpegdecoder.h b/app/codec/ffmpeg/ffmpegdecoder.h index 2634f06f4..6bbf80b1e 100644 --- a/app/codec/ffmpeg/ffmpegdecoder.h +++ b/app/codec/ffmpeg/ffmpegdecoder.h @@ -32,7 +32,6 @@ extern "C" { #include #include -#include "avframeptr.h" #include "codec/decoder.h" #include "codec/waveoutput.h" #include "ffmpegframepool.h"