diff --git a/app/streaming/video/ffmpeg.cpp b/app/streaming/video/ffmpeg.cpp
index 9afcabf2..94ff0f46 100644
--- a/app/streaming/video/ffmpeg.cpp
+++ b/app/streaming/video/ffmpeg.cpp
@@ -564,23 +564,6 @@ bool FFmpegVideoDecoder::completeInitialization(const AVCodec* decoder, enum AVP
         return false;
     }
 
-    // The V4L2M2M decoders are one of the rare non-hwaccel decoders that allocates
-    // hardware frames under the hood. We need to adjust the number of buffers it
-    // allocates to ensure it allocates enough for our use case, but not too many.
-    // Normal hwaccel decoders will examine the codec/bitstream and the value we
-    // set in extra_hw_frames to determine how many buffers are required.
-    if (QString::fromUtf8(decoder->name).endsWith("_v4l2m2m", Qt::CaseInsensitive)) {
-        // 2 buffers for incoming compressed video data
-        av_dict_set_int(&options, "num_output_buffers", 2, 0);
-
-        // 4 ref frames + what pacer holds + a working surface for each output
-        //
-        // NB: The reason we allocate 4 ref frames and not 16 (H.264 maximum)
-        // is because V4L2M2M decoders have reference frame invalidation disabled
-        // for compatibility, so we will never actually need 16 reference frames.
-        av_dict_set_int(&options, "num_capture_buffers", 4 + PACER_MAX_OUTSTANDING_FRAMES + 2, 0);
-    }
-
     QString optionVarName = QString("%1_AVOPTIONS").arg(decoder->name).toUpper();
     QByteArray optionVarValue = qgetenv(optionVarName.toUtf8());
     if (!optionVarValue.isNull()) {