From e29ce33a36c2e20444d57196defc86d5072bce81 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 29 Apr 2021 00:27:49 +0200 Subject: Switch decoding to ffmpeg send/receive API. --- src/lib/ffmpeg_decoder.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/ffmpeg_decoder.h') diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index d19a9f703..fce3fcae9 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -54,11 +54,12 @@ private: bool flush (); + static std::shared_ptr deinterleave_audio (AVFrame* frame); + AVSampleFormat audio_sample_format (std::shared_ptr stream) const; int bytes_per_audio_sample (std::shared_ptr stream) const; std::shared_ptr audio_stream_from_index (int index) const; - std::pair decode_audio_packet (std::shared_ptr stream, AVPacket* packet); void process_audio_frame (std::shared_ptr stream); bool decode_and_process_video_packet (AVPacket* packet); @@ -69,7 +70,6 @@ private: void process_ass_subtitle (std::string ass, dcpomatic::ContentTime from); void maybe_add_subtitle (); - std::shared_ptr deinterleave_audio (std::shared_ptr stream) const; std::list > _filter_graphs; boost::mutex _filter_graphs_mutex; -- cgit v1.2.3