summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-06-26 16:35:43 +0100
committerCarl Hetherington <cth@carlh.net>2013-06-26 16:35:43 +0100
commitd39bfb9a1360a83f3451b79d01fdc4f465ef21d3 (patch)
tree64ea69741155d15d114ad96daf0f90e24b3abe28 /src/lib/ffmpeg_content.h
parent7cd29c67a1977d67fc63f58c1d29826d7993a750 (diff)
Improve FFmpeg sync, in theory.
Diffstat (limited to 'src/lib/ffmpeg_content.h')
-rw-r--r--src/lib/ffmpeg_content.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index fc45267ee..c5ccee77a 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -46,7 +46,7 @@ public:
int frame_rate;
int channels;
AudioMapping mapping;
- boost::optional<Time> start;
+ boost::optional<double> first_audio;
};
extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
@@ -134,6 +134,11 @@ public:
void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
void set_audio_stream (boost::shared_ptr<FFmpegAudioStream>);
+
+ boost::optional<Time> first_video () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _first_video;
+ }
private:
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;