[FFmpeg-cvslog] avutil/channel_layout: fix definition of 5.1.4 layout

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Dec 30 15:21:45 2024 -0300| [aba9fafee7fc7edb856482d1c207d283b0d72069] | committer: James Almer

avutil/channel_layout: fix definition of 5.1.4 layout

It's meant to have the side channels, as defined in Sound System D from
ITU-R - BS.2051-3

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aba9fafee7fc7edb856482d1c207d283b0d72069
---

 libavutil/channel_layout.h    | 2 +-
 libavutil/version.h           | 2 +-
 tests/ref/fate/channel_layout | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h
index 456be8481f..793df44c12 100644
--- a/libavutil/channel_layout.h
+++ b/libavutil/channel_layout.h
@@ -244,7 +244,7 @@ enum AVChannelOrder {
 #define AV_CH_LAYOUT_5POINT1POINT2_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT)
 #define AV_CH_LAYOUT_OCTAGONAL         (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT)
 #define AV_CH_LAYOUT_CUBE              (AV_CH_LAYOUT_QUAD|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT)
-#define AV_CH_LAYOUT_5POINT1POINT4_BACK (AV_CH_LAYOUT_5POINT1POINT2_BACK|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT)
+#define AV_CH_LAYOUT_5POINT1POINT4_BACK (AV_CH_LAYOUT_5POINT1POINT2|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT)
 #define AV_CH_LAYOUT_7POINT1POINT2     (AV_CH_LAYOUT_7POINT1|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT)
 #define AV_CH_LAYOUT_7POINT1POINT4_BACK (AV_CH_LAYOUT_7POINT1POINT2|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT)
 #define AV_CH_LAYOUT_7POINT2POINT3     (AV_CH_LAYOUT_7POINT1POINT2|AV_CH_TOP_BACK_CENTER|AV_CH_LOW_FREQUENCY_2)
diff --git a/libavutil/version.h b/libavutil/version.h
index 75b47461ff..f2c609da78 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -80,7 +80,7 @@
 
 #define LIBAVUTIL_VERSION_MAJOR  59
 #define LIBAVUTIL_VERSION_MINOR  54
-#define LIBAVUTIL_VERSION_MICRO 100
+#define LIBAVUTIL_VERSION_MICRO 101
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \
diff --git a/tests/ref/fate/channel_layout b/tests/ref/fate/channel_layout
index fcbe6cc8b3..6b079d36e7 100644
--- a/tests/ref/fate/channel_layout
+++ b/tests/ref/fate/channel_layout
@@ -29,7 +29,7 @@ hexagonal      FL+FR+FC+BL+BR+BC
 5.1.2(back)    FL+FR+FC+LFE+BL+BR+TFL+TFR
 octagonal      FL+FR+FC+BL+BR+BC+SL+SR
 cube           FL+FR+BL+BR+TFL+TFR+TBL+TBR
-5.1.4          FL+FR+FC+LFE+BL+BR+TFL+TFR+TBL+TBR
+5.1.4          FL+FR+FC+LFE+SL+SR+TFL+TFR+TBL+TBR
 7.1.2          FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR
 7.1.4          FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBL+TBR
 7.2.3          FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBC+LFE2