]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/apedec: remove FF_ALLOC_OR_GOTO and gotos lable
authorLimin Wang <lance.lmwang@gmail.com>
Mon, 1 Jun 2020 13:26:53 +0000 (21:26 +0800)
committerLimin Wang <lance.lmwang@gmail.com>
Fri, 12 Jun 2020 22:59:18 +0000 (06:59 +0800)
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
libavcodec/apedec.c

index 0bee9d83f1b677147318e2ca322025f2e16fcfb4..a81767307a20509cf88b0bc5e6f7aa3db255f99c 100644 (file)
@@ -262,9 +262,8 @@ static av_cold int ape_decode_init(AVCodecContext *avctx)
     for (i = 0; i < APE_FILTER_LEVELS; i++) {
         if (!ape_filter_orders[s->fset][i])
             break;
-        FF_ALLOC_OR_GOTO(avctx, s->filterbuf[i],
-                         (ape_filter_orders[s->fset][i] * 3 + HISTORY_SIZE) * 4,
-                         filter_alloc_fail);
+        if (!(s->filterbuf[i] = av_malloc((ape_filter_orders[s->fset][i] * 3 + HISTORY_SIZE) * 4)))
+            return AVERROR(ENOMEM);
     }
 
     if (s->fileversion < 3860) {
@@ -300,8 +299,6 @@ static av_cold int ape_decode_init(AVCodecContext *avctx)
     avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;
 
     return 0;
-filter_alloc_fail:
-    return AVERROR(ENOMEM);
 }
 
 /**