Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / s302m.c

diff --git a/libavcodec/s302m.c b/libavcodec/s302m.c
index 4a17fa102e6f0f8def990c7f4a0423d61124607c..a6f207c4f63833ee6bbe11eddd7a8ffbd207ea10 100644 (file)
--- a/libavcodec/s302m.c
+++ b/libavcodec/s302m.c
@@ -74,6 +74,9 @@ static int s302m_parse_frame_header(AVCodecContext *avctx, const uint8_t *buf,
         case 4:
             avctx->channel_layout = AV_CH_LAYOUT_QUAD;
             break;
+        case 6:
+            avctx->channel_layout = AV_CH_LAYOUT_5POINT1_BACK;
+            break;
         case 8:
             avctx->channel_layout = AV_CH_LAYOUT_5POINT1_BACK | AV_CH_LAYOUT_STEREO_DOWNMIX;
     }