X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=29e0d22e6339d6bc957c8f9a9552805c468bdd16;hp=d19a9f703bccba457196c5ef288665e009838335;hb=84039db657c3cc72719706a136c90741170c765a;hpb=39fb8198febde1937019db1c300ec363aab5aa56

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index d19a9f703..29e0d22e6 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -54,13 +54,16 @@ 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);
 
+	void process_video_frame ();
+
 	bool decode_and_process_video_packet (AVPacket* packet);
 	void decode_and_process_audio_packet (AVPacket* packet);
 	void decode_and_process_subtitle_packet (AVPacket* packet);
@@ -69,7 +72,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;