diff --git a/libobs/media-io/audio-resampler-ffmpeg.c b/libobs/media-io/audio-resampler-ffmpeg.c
index 4310305d6..7680125bc 100644
--- a/libobs/media-io/audio-resampler-ffmpeg.c
+++ b/libobs/media-io/audio-resampler-ffmpeg.c
@@ -63,10 +63,10 @@ static inline uint64_t convert_speaker_layout(enum speaker_layout layout)
 	case SPEAKERS_UNKNOWN:          return 0;
 	case SPEAKERS_MONO:             return AV_CH_LAYOUT_MONO;
 	case SPEAKERS_STEREO:           return AV_CH_LAYOUT_STEREO;
-	case SPEAKERS_2POINT1:          return AV_CH_LAYOUT_2_1;
+	case SPEAKERS_2POINT1:          return AV_CH_LAYOUT_SURROUND;
 	case SPEAKERS_4POINT0:          return AV_CH_LAYOUT_4POINT0;
 	case SPEAKERS_4POINT1:          return AV_CH_LAYOUT_4POINT1;
-	case SPEAKERS_5POINT1:          return AV_CH_LAYOUT_5POINT1;
+	case SPEAKERS_5POINT1:          return AV_CH_LAYOUT_5POINT1_BACK;
 	case SPEAKERS_7POINT1:          return AV_CH_LAYOUT_7POINT1;
 	}
 
diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c b/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c
index 1b83ada13..e91f7e18a 100644
--- a/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c
+++ b/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c
@@ -62,10 +62,10 @@ static inline uint64_t convert_speaker_layout(enum speaker_layout layout)
 	case SPEAKERS_UNKNOWN:          return 0;
 	case SPEAKERS_MONO:             return AV_CH_LAYOUT_MONO;
 	case SPEAKERS_STEREO:           return AV_CH_LAYOUT_STEREO;
-	case SPEAKERS_2POINT1:          return AV_CH_LAYOUT_2_1;
+	case SPEAKERS_2POINT1:          return AV_CH_LAYOUT_SURROUND;
 	case SPEAKERS_4POINT0:          return AV_CH_LAYOUT_4POINT0;
 	case SPEAKERS_4POINT1:          return AV_CH_LAYOUT_4POINT1;
-	case SPEAKERS_5POINT1:          return AV_CH_LAYOUT_5POINT1;
+	case SPEAKERS_5POINT1:          return AV_CH_LAYOUT_5POINT1_BACK;
 	case SPEAKERS_7POINT1:          return AV_CH_LAYOUT_7POINT1;
 	}
 
@@ -78,10 +78,10 @@ static inline enum speaker_layout convert_ff_channel_layout(uint64_t  channel_la
 	switch (channel_layout) {
 	case AV_CH_LAYOUT_MONO:              return SPEAKERS_MONO;
 	case AV_CH_LAYOUT_STEREO:            return SPEAKERS_STEREO;
-	case AV_CH_LAYOUT_2_1:               return SPEAKERS_2POINT1;
+	case AV_CH_LAYOUT_SURROUND:          return SPEAKERS_2POINT1;
 	case AV_CH_LAYOUT_4POINT0:           return SPEAKERS_4POINT0;
 	case AV_CH_LAYOUT_4POINT1:           return SPEAKERS_4POINT1;
-	case AV_CH_LAYOUT_5POINT1:           return SPEAKERS_5POINT1;
+	case AV_CH_LAYOUT_5POINT1_BACK:      return SPEAKERS_5POINT1;
 	case AV_CH_LAYOUT_7POINT1:           return SPEAKERS_7POINT1;
 	}