avcodec/huffyuv: simplify allocation of temporaries

This also fixes a null pointer dereference with rgb and plane prediction

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 4 insertions, 10 deletions

diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index 80b35ed9c8..386653518f 100644
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -58,17 +58,11 @@ av_cold int ff_huffyuv_alloc_temp(HYuvContext *s)
 {
     int i;
 
-    if (s->bitstream_bpp<24 || s->version > 2) {
-        for (i=0; i<3; i++) {
-            s->temp[i]= av_malloc(2*s->width + 16);
-            if (!s->temp[i])
-                return AVERROR(ENOMEM);
-            s->temp16[i] = (uint16_t*)s->temp[i];
-        }
-    } else {
-        s->temp[0]= av_mallocz(4*s->width + 16);
-        if (!s->temp[0])
+    for (i=0; i<3; i++) {
+        s->temp[i]= av_malloc(4*s->width + 16);
+        if (!s->temp[i])
             return AVERROR(ENOMEM);
+        s->temp16[i] = (uint16_t*)s->temp[i];
     }
     return 0;
 }