avcodec/huffyuv: Inline common alloc/free functions in their callers

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

1 files changed, 12 insertions, 6 deletions

diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c
index 0222565245..8329666fc0 100644
--- a/libavcodec/huffyuvenc.c
+++ b/libavcodec/huffyuvenc.c
@@ -430,12 +430,15 @@ static av_cold int encode_init(AVCodecContext *avctx)
                 s->stats[i][j]= 0;
     }
 
-    ret = ff_huffyuv_alloc_temp(s->temp, s->temp16, avctx->width);
-    if (ret < 0)
-        return ret;
-
     s->picture_number=0;
 
+    for (int i = 0; i < 3; i++) {
+        s->temp[i] = av_malloc(4 * avctx->width + 16);
+        if (!s->temp[i])
+            return AVERROR(ENOMEM);
+        s->temp16[i] = (uint16_t*)s->temp[i];
+    }
+
     return 0;
 }
 static int encode_422_bitstream(HYuvEncContext *s, int offset, int count)
@@ -1035,10 +1038,13 @@ static av_cold int encode_end(AVCodecContext *avctx)
 {
     HYuvEncContext *s = avctx->priv_data;
 
-    ff_huffyuv_common_end(s->temp, s->temp16);
-
     av_freep(&avctx->stats_out);
 
+    for (int i = 0; i < 3; i++) {
+        av_freep(&s->temp[i]);
+        s->temp16[i] = NULL;
+    }
+
     return 0;
 }