[FFmpeg-cvslog] Revert "Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'"

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Apr 13 17:10:44 2016 +0100| [2691a8399f57cb22f18dfb13e3575dc44bebd22e] | committer: Derek Buitenhuis

Revert "Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'"

Broke a lot of stuff and didn't fix anything.

This reverts commit 3c461eecd48ba2cf7616d98e6f99954de3ad4b06, reversing
changes made to 884dd175f061c03d7ba4896685e81bf8adc3ea94.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2691a8399f57cb22f18dfb13e3575dc44bebd22e
---

 libavformat/utils.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index bf4ea2b..d6aba5a 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3723,6 +3723,9 @@ 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)
@@ -3803,9 +3806,6 @@ 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];