Merge commit '1ceb07eb'

* commit '1ceb07eb':
  avformat_find_stream_info: move duration guessing after updating codec parameters
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libavformat/utils.c

@@ -3723,9 +3723,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
         }
     }
 
-    if (probesize)
-        estimate_timings(ic, old_offset);
-
     av_opt_set(ic, "skip_clear", "0", AV_OPT_SEARCH_CHILDREN);
 
     if (ret >= 0 && ic->nb_streams)
@@ -3806,6 +3803,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
         st->internal->avctx_inited = 0;
     }
 
+    if (probesize)
+        estimate_timings(ic, old_offset);
+
 find_stream_info_err:
     for (i = 0; i < ic->nb_streams; i++) {
         st = ic->streams[i];