summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ffmpeg_content.cc2
-rw-r--r--src/lib/video_decoder.h5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index f4e1b9e72..bacc3183c 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -300,7 +300,7 @@ FFmpegAudioStream::FFmpegAudioStream (shared_ptr<const cxml::Node> node)
frame_rate = node->number_child<int> ("FrameRate");
channels = node->number_child<int64_t> ("Channels");
mapping = AudioMapping (node->node_child ("Mapping"));
- first_audio = node->optional_number_child<Time> ("FirstAudio");
+ first_audio = node->optional_number_child<double> ("FirstAudio");
}
void
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 0b3350472..0560cbb6f 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -30,7 +30,10 @@ class VideoDecoder : public virtual Decoder
public:
VideoDecoder (boost::shared_ptr<const Film>);
- virtual void seek (VideoContent::Frame, bool) = 0;
+ /** Seek so that the next pass() will yield (approximately) the requested frame.
+ * Pass accurate = true to try harder to get close to the request.
+ */
+ virtual void seek (VideoContent::Frame frame, bool accurate) = 0;
/** Emitted when a video frame is ready.
* First parameter is the video image.