diff --git a/libavfilter/af_surround.c b/libavfilter/af_surround.c
index 6632385a54..d38a2a236e 100644
--- a/libavfilter/af_surround.c
+++ b/libavfilter/af_surround.c
@@ -1143,8 +1143,12 @@ static av_cold int init(AVFilterContext *ctx)
         switch (out_channel_layout) {
         case AV_CH_LAYOUT_MONO:
         case AV_CH_LAYOUT_STEREO:
+        case AV_CH_LAYOUT_2POINT1:
+        case AV_CH_LAYOUT_2_1:
+        case AV_CH_LAYOUT_2_2:
         case AV_CH_LAYOUT_SURROUND:
         case AV_CH_LAYOUT_3POINT1:
+        case AV_CH_LAYOUT_QUAD:
         case AV_CH_LAYOUT_4POINT0:
         case AV_CH_LAYOUT_4POINT1:
         case AV_CH_LAYOUT_5POINT0: