Hand-apply cb998bee2e70f3426fd95655736deae803efa58e from master; examine a whole FFmpeg file if there is no length information in the header.

1 files changed, 5 insertions, 0 deletions

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 1ef7e3ba9..c24d2ebcf 100644
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -59,4 +59,9 @@ private:
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
 	std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
 	boost::optional<ContentTime> _first_video;
+	/** Video length, either obtained from the header or derived by running
+	 *  through the whole file.
+	 */
+	ContentTime _video_length;
+	bool _need_video_length;
 };