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

lavf/dashdec: drop unnecessary check before ff_format_io_close 

ff_format_io_close will check the AVIOContext pointer pb, so drop
the unnecessary check before ff_format_io_close.

Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
This commit is contained in:
Jun Zhao 2019-09-24 00:30:17 +08:00
parent a23c8d75ec
commit e700038990
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/dashdec.c
View File

@ -363,8 +363,7 @@ static void free_representation(struct representation *pls)
free_fragment(&pls->init_section); free_fragment(&pls->init_section);
av_freep(&pls->init_sec_buf); av_freep(&pls->init_sec_buf);
av_freep(&pls->pb.buffer); av_freep(&pls->pb.buffer);
if (pls->input) ff_format_io_close(pls->parent, &pls->input);
ff_format_io_close(pls->parent, &pls->input);
if (pls->ctx) { if (pls->ctx) {
pls->ctx->pb = NULL; pls->ctx->pb = NULL;
avformat_close_input(&pls->ctx); avformat_close_input(&pls->ctx);
@ -2183,8 +2182,7 @@ static void recheck_discard_flags(AVFormatContext *s, struct representation **p,
av_log(s, AV_LOG_INFO, "Now receiving stream_index %d\n", pls->stream_index); av_log(s, AV_LOG_INFO, "Now receiving stream_index %d\n", pls->stream_index);
} else if (!needed && pls->ctx) { } else if (!needed && pls->ctx) {
close_demux_for_component(pls); close_demux_for_component(pls);
if (pls->input) ff_format_io_close(pls->parent, &pls->input);
ff_format_io_close(pls->parent, &pls->input);
av_log(s, AV_LOG_INFO, "No longer receiving stream_index %d\n", pls->stream_index); av_log(s, AV_LOG_INFO, "No longer receiving stream_index %d\n", pls->stream_index);
} }
} }
@ -2245,8 +2243,7 @@ static int dash_read_packet(AVFormatContext *s, AVPacket *pkt)
if (cur->is_restart_needed) { if (cur->is_restart_needed) {
cur->cur_seg_offset = 0; cur->cur_seg_offset = 0;
cur->init_sec_buf_read_offset = 0; cur->init_sec_buf_read_offset = 0;
if (cur->input) ff_format_io_close(cur->parent, &cur->input);
ff_format_io_close(cur->parent, &cur->input);
ret = reopen_demux_for_component(s, cur); ret = reopen_demux_for_component(s, cur);
cur->is_restart_needed = 0; cur->is_restart_needed = 0;
} }
@ -2284,8 +2281,7 @@ static int dash_seek(AVFormatContext *s, struct representation *pls, int64_t see
return av_seek_frame(pls->ctx, -1, seek_pos_msec * 1000, flags); return av_seek_frame(pls->ctx, -1, seek_pos_msec * 1000, flags);
} }
if (pls->input) ff_format_io_close(pls->parent, &pls->input);
ff_format_io_close(pls->parent, &pls->input);
// find the nearest fragment // find the nearest fragment
if (pls->n_timelines > 0 && pls->fragment_timescale > 0) { if (pls->n_timelines > 0 && pls->fragment_timescale > 0) {