ffmpeg | branch: master | Marth64 <mart...@proxyid.net> | Fri Oct 11 02:06:35 2024 -0500| [6ee7555a909d263080de8490628e92bf0c5cdb15] | committer: Steven Liu
avformat/dashdec: return ret directly in open_demux_for_component() Signed-off-by: Marth64 <mart...@proxyid.net> Reviewed-by: Steven Liu <l...@chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ee7555a909d263080de8490628e92bf0c5cdb15 --- libavformat/dashdec.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 99ac6197be..9ce23aec65 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1939,16 +1939,15 @@ static int open_demux_for_component(AVFormatContext *s, struct representation *p } ret = reopen_demux_for_component(s, pls); - if (ret < 0) { - goto fail; - } + if (ret < 0) + return ret; + for (i = 0; i < pls->ctx->nb_streams; i++) { AVStream *st = avformat_new_stream(s, NULL); AVStream *ist = pls->ctx->streams[i]; - if (!st) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!st) + return AVERROR(ENOMEM); + st->id = i; avcodec_parameters_copy(st->codecpar, ist->codecpar); avpriv_set_pts_info(st, ist->pts_wrap_bits, ist->time_base.num, ist->time_base.den); @@ -1958,8 +1957,6 @@ static int open_demux_for_component(AVFormatContext *s, struct representation *p } return 0; -fail: - return ret; } static int is_common_init_section_exist(struct representation **pls, int n_pls) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
