Browse Source

Revert "Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'"

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

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

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
tags/n3.1
Derek Buitenhuis 9 years ago
parent
commit
2691a8399f
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      libavformat/utils.c

+ 3
- 3
libavformat/utils.c View File

@@ -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];


Loading…
Cancel
Save