avcodec/opus/parser: remove duplicate failure path code

James Almer committed 1 year ago

Commit 2f4ec161 parent 37155d61 file · +10 −14Browse files

Unified · Split

     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;
+            goto fail;
-            *poutbuf_size = 0;
-            return buf_size;
         }
         av_freep(&s->ctx.channel_maps);
         s->extradata_parsed = 1;
     if (ctx->flags & PARSER_FLAG_COMPLETE_FRAMES) {
         next = buf_size;
-        if (set_frame_duration(ctx, avctx, buf, buf_size) < 0) {
+        if (set_frame_duration(ctx, avctx, buf, buf_size) < 0)
-            *poutbuf      = NULL;
+            goto fail;
-            *poutbuf_size = 0;
-            return buf_size;
-        }
     } 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;
+            goto fail;
-            *poutbuf_size = 0;
-            return buf_size;
         }
         if (next == AVERROR_INVALIDDATA){
-            *poutbuf      = NULL;
+            goto fail;
-            *poutbuf_size = 0;
-            return buf_size;
         }
     }
     *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 = {

Keyboard shortcuts