From 7bc2134d658778e04f1756c255e604b4ab5a5831 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 7 Apr 2021 22:15:01 +0200 Subject: Assorted C++11/formatting cleanups. --- src/lib/ffmpeg.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'src/lib/ffmpeg.h') diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h index fac8a2d84..5e1d0842e 100644 --- a/src/lib/ffmpeg.h +++ b/src/lib/ffmpeg.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,9 +18,11 @@ */ + #ifndef DCPOMATIC_FFMPEG_H #define DCPOMATIC_FFMPEG_H + #include "file_group.h" #include "ffmpeg_subtitle_period.h" #include "warnings.h" @@ -31,6 +33,7 @@ extern "C" { DCPOMATIC_ENABLE_WARNINGS #include + struct AVFormatContext; struct AVFrame; struct AVIOContext; @@ -39,6 +42,7 @@ class FFmpegContent; class FFmpegAudioStream; class Log; + class FFmpeg { public: @@ -56,20 +60,20 @@ protected: AVCodecContext* video_codec_context () const; AVCodecContext* subtitle_codec_context () const; dcpomatic::ContentTime pts_offset ( - std::vector > audio_streams, boost::optional first_video, double video_frame_rate + std::vector> audio_streams, boost::optional first_video, double video_frame_rate ) const; static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const & sub); std::shared_ptr _ffmpeg_content; - uint8_t* _avio_buffer; - int _avio_buffer_size; - AVIOContext* _avio_context; + uint8_t* _avio_buffer = nullptr; + int _avio_buffer_size = 4096; + AVIOContext* _avio_context = nullptr; FileGroup _file_group; - AVFormatContext* _format_context; - AVFrame* _frame; + AVFormatContext* _format_context = nullptr; + AVFrame* _frame = nullptr; /** Index of video stream within AVFormatContext */ boost::optional _video_stream; @@ -88,4 +92,5 @@ private: static std::weak_ptr _ffmpeg_log; }; + #endif -- cgit v1.2.3