diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c
index ec961e733a..f571075b1b 100644
--- a/libavcodec/svq1dec.c
+++ b/libavcodec/svq1dec.c
@@ -793,7 +793,7 @@ static av_cold int svq1_decode_end(AVCodecContext *avctx)
 {
     SVQ1Context *s = avctx->priv_data;
 
-    avcodec_free_frame(&s->prev);
+    av_frame_free(&s->prev);
 
     return 0;
 }
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 8475c67ec6..13f8d0f231 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -782,7 +782,7 @@ do {                                                                    \
             for (i = 0; i < FFMIN(planes, FF_ARRAY_ELEMS(frame->buf)); i++)
                 WRAP_PLANE(frame->buf[i], frame->extended_data[i], frame->linesize[0]);
 
-            for (i = 0; i < planes - FF_ARRAY_ELEMS(frame->buf); i++)
+            for (i = 0; i < frame->nb_extended_buf; i++)
                 WRAP_PLANE(frame->extended_buf[i],
                            frame->extended_data[i + FF_ARRAY_ELEMS(frame->buf)],
                            frame->linesize[0]);