RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/mpegts: dont clear programs during probing 

Fixes Ticket 3763

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-12 21:49:15 +02:00
parent 1db641cbd2
commit 4470a3eeaf
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mpegts.c
View File

@ -138,6 +138,7 @@ struct MpegTSContext {
int64_t last_pos;
int skip_changes;
int skip_clear;
/******************************************/
/* private mpegts data */
@ -177,6 +178,8 @@ static const AVOption mpegts_options[] = {
{.i64 = 0}, 0, 0, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY },
{"skip_changes", "Skip changing / adding streams / programs.", offsetof(MpegTSContext, skip_changes), AV_OPT_TYPE_INT,
{.i64 = 0}, 0, 1, 0 },
{"skip_clear", "Skip clearing programs.", offsetof(MpegTSContext, skip_clear), AV_OPT_TYPE_INT,
{.i64 = 0}, 0, 1, 0 },
{ NULL },
};
@ -1931,7 +1934,7 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
for (i = 0; i < ts->nb_prg; i++)
if (ts->prg[i].id == ts->stream->programs[j]->id)
break;
if (i==ts->nb_prg)
if (i==ts->nb_prg && !ts->skip_clear)
clear_avprogram(ts, ts->stream->programs[j]->id);
}
}

3
libavformat/utils.c
View File

@ -3111,6 +3111,8 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
if (!max_analyze_duration)
max_analyze_duration = ic->max_analyze_duration;
av_opt_set(ic, "skip_clear", "1", AV_OPT_SEARCH_CHILDREN);
if (!max_analyze_duration) {
if (!strcmp(ic->iformat->name, "flv") && !(ic->ctx_flags & AVFMTCTX_NOHEADER)) {
max_analyze_duration = 10*AV_TIME_BASE;
@ -3396,6 +3398,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
}
}
}
av_opt_set(ic, "skip_clear", "0", AV_OPT_SEARCH_CHILDREN);
// close codecs which were opened in try_decode_frame()
for (i = 0; i < ic->nb_streams; i++) {