Merge commit '6f7a3283'

* commit '6f7a3283':
  svq1enc: correctly handle memory error and allocations

Conflicts:
	libavcodec/svq1enc.c

See: 79888388Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/svq1enc.c

@@ -595,10 +595,10 @@ static int svq1_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
         }
     }
     if (!s->last_picture->data[0]) {
-        if ((ret = ff_get_buffer(avctx, s->last_picture, 0)) < 0) {
+        ret = ff_get_buffer(avctx, s->last_picture, 0);
+        if (ret < 0)
             return ret;
     }
-    }
     if (!s->scratchbuf) {
         s->scratchbuf = av_malloc_array(s->current_picture->linesize[0], 16 * 3);
         if (!s->scratchbuf)