operator bool on Time is a really bad idea; removed it and fixed lots of bugs.

[dcpomatic.git] / src / lib / ffmpeg_examiner.cc

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 3de62ad079738748f8edaa223faa0a8e562fc663..093df09892082e587f236d91665bd9661d09cb65 100644 (file)
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -121,6 +121,7 @@ FFmpegExaminer::video_frame_rate () const
        AVStream* s = _format_context->streams[_video_stream];
 
        if (s->avg_frame_rate.num && s->avg_frame_rate.den) {
+               cout << "here we bitchen well are " << av_q2d (s->avg_frame_rate) << "\n";
                return av_q2d (s->avg_frame_rate);
        }
 
@@ -138,7 +139,7 @@ ContentTime
 FFmpegExaminer::video_length () const
 {
        ContentTime const length = ContentTime::from_seconds (double (_format_context->duration) / AV_TIME_BASE);
-       return ContentTime (1, length.get ());
+       return ContentTime (max (int64_t (1), length.get ()));
 }
 
 string