virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Revert "Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'"

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

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

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis
2016-04-13 17:10:44 +01:00
parent f8b09e90e9
commit 2691a8399f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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); 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
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];