diff --git a/libavcodec/codec_internal.h b/libavcodec/codec_internal.h
index ed0dea86de4f3..130a7dc3cd778 100644
--- a/libavcodec/codec_internal.h
+++ b/libavcodec/codec_internal.h
@@ -80,10 +80,6 @@
  * Codec supports embedded ICC profiles (AV_FRAME_DATA_ICC_PROFILE).
  */
 #define FF_CODEC_CAP_ICC_PROFILES           (1 << 9)
-/**
- * The decoder requires contiguous buffers.
- */
-#define FF_CODEC_CAP_CONTIGUOUS_BUFFERS     (1 << 28)
 /**
  * The encoder has AV_CODEC_CAP_DELAY set, but does not actually have delay - it
  * only wants to be flushed at the end to update some context variables (e.g.
diff --git a/libavcodec/get_buffer.c b/libavcodec/get_buffer.c
index c6a1983f7ea12..a04fd878de642 100644
--- a/libavcodec/get_buffer.c
+++ b/libavcodec/get_buffer.c
@@ -32,7 +32,6 @@
 
 #include "avcodec.h"
 #include "internal.h"
-#include "codec_internal.h"
 
 typedef struct FramePool {
     /**
@@ -148,14 +147,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
 
         for (i = 0; i < 4; i++) {
             pool->linesize[i] = linesize[i];
-
-            if (ffcodec(avctx->codec)->caps_internal & FF_CODEC_CAP_CONTIGUOUS_BUFFERS) {
-                if (!i)
-                    size[0] += size[1] + size[2] + size[3];
-                else
-                    continue;
-            }
-
             if (size[i]) {
                 if (size[i] > INT_MAX - (16 + STRIDE_ALIGN - 1)) {
                     ret = AVERROR(EINVAL);
@@ -274,21 +265,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
 
         pic->data[i] = pic->buf[i]->data;
     }
-
-    if (ffcodec(s->codec)->caps_internal & FF_CODEC_CAP_CONTIGUOUS_BUFFERS) {
-        int size;
-
-        for (i = 1; i < 4; i++) {
-            pic->linesize[i] = pool->linesize[i];
-            av_buffer_unref(&pic->buf[i]);
-        }
-
-        size = av_image_fill_pointers(pic->data, pic->format, pic->height,
-                                      pic->buf[0]->data, pic->linesize);
-        if (size < 0 || size > pic->buf[0]->size)
-            goto fail;
-    }
-
     for (; i < AV_NUM_DATA_POINTERS; i++) {
         pic->data[i] = NULL;
         pic->linesize[i] = 0;
diff --git a/libavcodec/rkmpp.h b/libavcodec/rkmpp.h
index c09ef5b564b2b..00e82db8dabe9 100644
--- a/libavcodec/rkmpp.h
+++ b/libavcodec/rkmpp.h
@@ -252,7 +252,7 @@ static const enum AVPixelFormat rkmppvepu5formats[] = {
             .close          = rkmpp_close_codec, \
             .flush          = rkmpp_flush, \
             .p.priv_class   = &rkmpp_##NAME##_##TYPE##_class, \
-            .caps_internal  = FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_CONTIGUOUS_BUFFERS, \
+            .caps_internal  = FF_CODEC_CAP_NOT_INIT_THREADSAFE, \
             .bsfs           = BSFS, \
             .p.wrapper_name = "rkmpp",