diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-11-10 22:59:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-02-15 01:53:19 +0100 |
| commit | c259c459f5d326e7c42806b41de06c71ad4a3ad8 (patch) | |
| tree | a3a976edbefb9638c11c5fa477e81efde60234c8 /src/lib/audio_decoder.cc | |
| parent | 9482a41238c370e093c896145b844dac0b221345 (diff) | |
Don't trust video timestamps from FFmpegDecoder.
Back-ported from 98342fb53eae4d32440fc69c279f2ca0fef785b5 in v2.15.x.
Diffstat (limited to 'src/lib/audio_decoder.cc')
| -rw-r--r-- | src/lib/audio_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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 |