Merge branch 'fix-early-audio-take2' into staging

1 files changed, 1 insertions, 6 deletions

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 1bb14ce9c..2a4d40b1d 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -111,9 +111,7 @@ private:
 	AVSampleFormat audio_sample_format () const;
 	int bytes_per_audio_sample () const;
 
-	void out_with_sync ();
-	void filter_and_emit_video (AVFrame *);
-	double frame_time () const;
+	void filter_and_emit_video ();
 
 	void setup_general ();
 	void setup_video ();
@@ -143,9 +141,6 @@ private:
 
 	AVPacket _packet;
 
-	boost::optional<double> _first_video;
-	boost::optional<double> _first_audio;
-
 	std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
 	boost::mutex _filter_graphs_mutex;
 };