Commit 2691a839 authored by Derek Buitenhuis's avatar Derek Buitenhuis

Revert "Merge commit '1ceb07eb'"

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

This reverts commit 3c461eec, reversing
changes made to 884dd175.
Signed-off-by: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parent f8b09e90
...@@ -3723,6 +3723,9 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -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); av_opt_set(ic, "skip_clear", "0", AV_OPT_SEARCH_CHILDREN);
if (ret >= 0 && ic->nb_streams) if (ret >= 0 && ic->nb_streams)
...@@ -3803,9 +3806,6 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -3803,9 +3806,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
st->internal->avctx_inited = 0; st->internal->avctx_inited = 0;
} }
if (probesize)
estimate_timings(ic, old_offset);
find_stream_info_err: find_stream_info_err:
for (i = 0; i < ic->nb_streams; i++) { for (i = 0; i < ic->nb_streams; i++) {
st = ic->streams[i]; st = ic->streams[i];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment