ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Fri Jan 3 18:23:07 2025 -0300| [2f4ec1683651e597dcdb13d1a4e679f3c1da0b16] | committer: James Almer
avcodec/opus/parser: remove duplicate failure path code Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f4ec1683651e597dcdb13d1a4e679f3c1da0b16 --- libavcodec/opus/parser.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/libavcodec/opus/parser.c b/libavcodec/opus/parser.c index 3ebb65d266..9bf0b31fba 100644 --- a/libavcodec/opus/parser.c +++ b/libavcodec/opus/parser.c @@ -179,9 +179,7 @@ static int opus_parse(AVCodecParserContext *ctx, AVCodecContext *avctx, if (avctx->extradata && !s->extradata_parsed) { if (ff_opus_parse_extradata(avctx, &s->ctx) < 0) { av_log(avctx, AV_LOG_ERROR, "Error parsing Ogg extradata.\n"); - *poutbuf = NULL; - *poutbuf_size = 0; - return buf_size; + goto fail; } av_freep(&s->ctx.channel_maps); s->extradata_parsed = 1; @@ -190,31 +188,29 @@ static int opus_parse(AVCodecParserContext *ctx, AVCodecContext *avctx, if (ctx->flags & PARSER_FLAG_COMPLETE_FRAMES) { next = buf_size; - if (set_frame_duration(ctx, avctx, buf, buf_size) < 0) { - *poutbuf = NULL; - *poutbuf_size = 0; - return buf_size; - } + if (set_frame_duration(ctx, avctx, buf, buf_size) < 0) + goto fail; } else { next = opus_find_frame_end(ctx, avctx, buf, buf_size, &header_len); if (s->ts_framing && next != AVERROR_INVALIDDATA && ff_combine_frame(pc, next, &buf, &buf_size) < 0) { - *poutbuf = NULL; - *poutbuf_size = 0; - return buf_size; + goto fail; } if (next == AVERROR_INVALIDDATA){ - *poutbuf = NULL; - *poutbuf_size = 0; - return buf_size; + goto fail; } } *poutbuf = buf + header_len; *poutbuf_size = buf_size - header_len; return next; + +fail: + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; } const AVCodecParser ff_opus_parser = { _______________________________________________ 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".
