diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-05-01 19:32:15 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-05-01 19:32:15 +0200 |
| commit | 1516214cdc7970797b79bca06b46a2eed16a1da3 (patch) | |
| tree | 4d9d474fd498cf44c666219af240740527022ffc /src/lib/ffmpeg_decoder.h | |
| parent | 8963f0007af1a312017b9627c18b82ec2a577591 (diff) | |
| parent | 6f792158e88d9426a0eafc7f1724a33ddbd453e5 (diff) | |
Build with FFmpeg 4.4 and switch to the new send/receive APIs.
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
| -rw-r--r-- | src/lib/ffmpeg_decoder.h | 4 |
1 files changed, 2 insertions, 2 deletions
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<AudioBuffers> deinterleave_audio (AVFrame* frame); + AVSampleFormat audio_sample_format (std::shared_ptr<FFmpegAudioStream> stream) const; int bytes_per_audio_sample (std::shared_ptr<FFmpegAudioStream> stream) const; std::shared_ptr<FFmpegAudioStream> audio_stream_from_index (int index) const; - std::pair<int, bool> decode_audio_packet (std::shared_ptr<FFmpegAudioStream> stream, AVPacket* packet); void process_audio_frame (std::shared_ptr<FFmpegAudioStream> 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<AudioBuffers> deinterleave_audio (std::shared_ptr<FFmpegAudioStream> stream) const; std::list<std::shared_ptr<VideoFilterGraph> > _filter_graphs; boost::mutex _filter_graphs_mutex; |