diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
index 257ff03..32b38e0 100644
--- a/mythtv/libs/libmythtv/avformatdecoder.cpp
+++ b/mythtv/libs/libmythtv/avformatdecoder.cpp
@@ -974,9 +974,15 @@ int AvFormatDecoder::OpenFile(RingBuffer *rbuffer, bool novideo,

     if (!livetv && !ringBuffer->IsDisc())
     {
+        if ((ic->duration == (int64_t)AV_NOPTS_VALUE) &&
+            (!livetv && !ringBuffer->IsDisc()))
+            av_estimate_timings(ic, 0);
         // generate timings based on the video stream to avoid bogus ffmpeg
         // values for duration and bitrate
         av_update_stream_timings_video(ic);
+        if ((ic->duration == (int64_t)AV_NOPTS_VALUE) &&
+            (!livetv && !ringBuffer->IsDisc()))
+            av_estimate_timings(ic, 0);
     }

     // Scan for the initial A/V streams
@@ -1025,10 +1031,6 @@ int AvFormatDecoder::OpenFile(RingBuffer *rbuffer, bool novideo,

     if (dur == 0)
     {
-        if ((ic->duration == (int64_t)AV_NOPTS_VALUE) &&
-            (!livetv && !ringBuffer->IsDisc()))
-            av_estimate_timings(ic, 0);
-
         dur = ic->duration / (int64_t)AV_TIME_BASE;
     }