avcodec/svq1enc: fix error handling/cleanup in case of ff_get_buffer() or scratchbuff...
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 20:25:06 +0000 (21:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 20:25:06 +0000 (21:25 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/svq1enc.c

index 552f39d3819cdb2b9a742d03998c772662e4bb0f..0c5971b4bb4f6f705d231b6dea008a7cbb7c7c09 100644 (file)
@@ -590,14 +590,20 @@ static int svq1_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     }
 
     if (!s->current_picture->data[0]) {
-        if ((ret = ff_get_buffer(avctx, s->current_picture, 0))< 0 ||
-            (ret = ff_get_buffer(avctx, s->last_picture, 0))   < 0) {
+        if ((ret = ff_get_buffer(avctx, s->current_picture, 0)) < 0) {
             return ret;
         }
-        s->scratchbuf = av_malloc(s->current_picture->linesize[0] * 16 * 3);
     }
-    if (!s->scratchbuf)
-        return AVERROR(ENOMEM);
+    if (!s->last_picture->data[0]) {
+        if ((ret = ff_get_buffer(avctx, s->last_picture, 0)) < 0) {
+            return ret;
+        }
+    }
+    if (!s->scratchbuf) {
+        s->scratchbuf = av_malloc_array(s->current_picture->linesize[0], 16 * 3);
+        if (!s->scratchbuf)
+            return AVERROR(ENOMEM);
+    }
 
     FFSWAP(AVFrame*, s->current_picture, s->last_picture);