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

James Almer committed 1 year ago

Commit aba9faf1 parent da9dcab3 files · +3 −3Browse files

Unified · Split

3 files

libavutil/channel_layout.h +1 −1
libavutil/version.h +1 −1
tests/ref/fate/channel_layout +1 −1

libavutil/channel_layout.h+1−1

@@ -244,7 +244,7 @@ enum AVChannelOrder { · 243 unmodified lines
244	244	#define AV_CH_LAYOUT_5POINT1POINT2_BACK (AV_CH_LAYOUT_5POINT1_BACK\|AV_CH_TOP_FRONT_LEFT\|AV_CH_TOP_FRONT_RIGHT)
245	245	#define AV_CH_LAYOUT_OCTAGONAL (AV_CH_LAYOUT_5POINT0\|AV_CH_BACK_LEFT\|AV_CH_BACK_CENTER\|AV_CH_BACK_RIGHT)
246	246	#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)
247		−#define AV_CH_LAYOUT_5POINT1POINT4_BACK (AV_CH_LAYOUT_5POINT1POINT2_BACK\|AV_CH_TOP_BACK_LEFT\|AV_CH_TOP_BACK_RIGHT)
	247	+#define AV_CH_LAYOUT_5POINT1POINT4_BACK (AV_CH_LAYOUT_5POINT1POINT2\|AV_CH_TOP_BACK_LEFT\|AV_CH_TOP_BACK_RIGHT)
248	248	#define AV_CH_LAYOUT_7POINT1POINT2 (AV_CH_LAYOUT_7POINT1\|AV_CH_TOP_FRONT_LEFT\|AV_CH_TOP_FRONT_RIGHT)
249	249	#define AV_CH_LAYOUT_7POINT1POINT4_BACK (AV_CH_LAYOUT_7POINT1POINT2\|AV_CH_TOP_BACK_LEFT\|AV_CH_TOP_BACK_RIGHT)
250	250	#define AV_CH_LAYOUT_7POINT2POINT3 (AV_CH_LAYOUT_7POINT1POINT2\|AV_CH_TOP_BACK_CENTER\|AV_CH_LOW_FREQUENCY_2)

libavutil/version.h+1−1

@@ -80,7 +80,7 @@ · 79 unmodified lines
80	80
81	81	#define LIBAVUTIL_VERSION_MAJOR 59
82	82	#define LIBAVUTIL_VERSION_MINOR 54
83		−#define LIBAVUTIL_VERSION_MICRO 100
	83	+#define LIBAVUTIL_VERSION_MICRO 101
84	84
85	85	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
86	86	LIBAVUTIL_VERSION_MINOR, \

tests/ref/fate/channel_layout+1−1

@@ -29,7 +29,7 @@ hexagonal FL+FR+FC+BL+BR+BC · 28 unmodified lines
29	29	5.1.2(back) FL+FR+FC+LFE+BL+BR+TFL+TFR
30	30	octagonal FL+FR+FC+BL+BR+BC+SL+SR
31	31	cube FL+FR+BL+BR+TFL+TFR+TBL+TBR
32		−5.1.4 FL+FR+FC+LFE+BL+BR+TFL+TFR+TBL+TBR
	32	+5.1.4 FL+FR+FC+LFE+SL+SR+TFL+TFR+TBL+TBR
33	33	7.1.2 FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR
34	34	7.1.4 FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBL+TBR
35	35	7.2.3 FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBC+LFE2