From c259c459f5d326e7c42806b41de06c71ad4a3ad8 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 10 Nov 2019 22:59:39 +0100
Subject: Don't trust video timestamps from FFmpegDecoder.

Back-ported from 98342fb53eae4d32440fc69c279f2ca0fef785b5 in v2.15.x.
---
 src/lib/audio_decoder.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/audio_decoder.cc')

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 440510ce5..2ab527f59 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -110,7 +110,7 @@ AudioDecoder::stream_position (shared_ptr<const Film> film, AudioStreamPtr strea
 	return ContentTime::from_frames (i->second, _content->resampled_frame_rate(film));
 }
 
-ContentTime
+optional<ContentTime>
 AudioDecoder::position (shared_ptr<const Film> film) const
 {
 	optional<ContentTime> p;
@@ -121,7 +121,7 @@ AudioDecoder::position (shared_ptr<const Film> film) const
 		}
 	}
 
-	return p.get_value_or(ContentTime());
+	return p;
 }
 
 void
-- 
cgit v1.2.3