This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 0e45eebe49a88079022d9cabee2b4eced755b003 Author: James Almer <[email protected]> AuthorDate: Fri Aug 21 18:55:13 2026 -0300 Commit: James Almer <[email protected]> CommitDate: Sun Aug 23 13:28:20 2026 -0300 avutil/channel_layout: remove back suffix from some layouts The idea was for the suffix to refer to the fact they feature Top Back channels instead of Top Side, but this distinction is unnecessary given there's no confusion between back and side like with base level channels (Ls/Rs, Lss/Rss, Lrs/Rsr), nor known specs where Top Side channels are used without Top Back also being used. Signed-off-by: James Almer <[email protected]> --- doc/APIchanges | 9 +++++++++ libavutil/channel_layout.c | 6 +++--- libavutil/channel_layout.h | 32 +++++++++++++++++++++++++------- libavutil/version.h | 3 ++- 4 files changed, 39 insertions(+), 11 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 0d3c337245..40b4ba3580 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,15 @@ The last version increases of all libraries were on 2026-06-23. API changes, most recent first: +2026-08-23 - xxxxxxxxxx - lavu 61.6.100 - channel_layout.h + Add AV_CH_LAYOUT_5POINT1POINT4 and AV_CHANNEL_LAYOUT_5POINT1POINT4. + Add AV_CH_LAYOUT_7POINT1POINT4 and AV_CHANNEL_LAYOUT_7POINT1POINT4. + Add AV_CH_LAYOUT_9POINT1POINT4 and AV_CHANNEL_LAYOUT_9POINT1POINT4. + Deprecate AV_CH_LAYOUT_5POINT1POINT4_BACK, AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK, + AV_CH_LAYOUT_7POINT1POINT4_BACK, AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK, + AV_CH_LAYOUT_9POINT1POINT4_BACK, AV_CHANNEL_LAYOUT_9POINT1POINT4_BACK. + Deprecate AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK. + 2026-08-13 - xxxxxxxxxx - lavc 63.8.101 - avcodec.h codec.h Add avcodec_encode_reconfigure. Add AV_CODEC_CAP_ENCODER_RECONF. diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index bd4aabaaa8..53ac5cd56d 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -218,11 +218,11 @@ static const struct channel_layout_name channel_layout_map[] = { { "5.1.2(back)", AV_CHANNEL_LAYOUT_5POINT1POINT2_BACK }, { "octagonal", AV_CHANNEL_LAYOUT_OCTAGONAL }, { "cube", AV_CHANNEL_LAYOUT_CUBE }, - { "5.1.4", AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK }, + { "5.1.4", AV_CHANNEL_LAYOUT_5POINT1POINT4 }, { "7.1.2", AV_CHANNEL_LAYOUT_7POINT1POINT2 }, - { "7.1.4", AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK }, + { "7.1.4", AV_CHANNEL_LAYOUT_7POINT1POINT4 }, { "7.2.3", AV_CHANNEL_LAYOUT_7POINT2POINT3 }, - { "9.1.4", AV_CHANNEL_LAYOUT_9POINT1POINT4_BACK }, + { "9.1.4", AV_CHANNEL_LAYOUT_9POINT1POINT4 }, { "9.1.6", AV_CHANNEL_LAYOUT_9POINT1POINT6 }, { "hexadecagonal", AV_CHANNEL_LAYOUT_HEXADECAGONAL }, { "binaural", AV_CHANNEL_LAYOUT_BINAURAL }, diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h index 5ad2d5ed98..f60754a5f4 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -244,18 +244,27 @@ 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|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT) +#define AV_CH_LAYOUT_5POINT1POINT4 (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_7POINT1POINT4 (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) -#define AV_CH_LAYOUT_9POINT1POINT4_BACK (AV_CH_LAYOUT_7POINT1POINT4_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) -#define AV_CH_LAYOUT_9POINT1POINT6 (AV_CH_LAYOUT_9POINT1POINT4_BACK|AV_CH_TOP_SIDE_LEFT|AV_CH_TOP_SIDE_RIGHT) +#define AV_CH_LAYOUT_9POINT1POINT4 (AV_CH_LAYOUT_7POINT1POINT4|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) +#define AV_CH_LAYOUT_9POINT1POINT6 (AV_CH_LAYOUT_9POINT1POINT4|AV_CH_TOP_SIDE_LEFT|AV_CH_TOP_SIDE_RIGHT) #define AV_CH_LAYOUT_HEXADECAGONAL (AV_CH_LAYOUT_OCTAGONAL|AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT) #define AV_CH_LAYOUT_BINAURAL (AV_CH_BINAURAL_LEFT|AV_CH_BINAURAL_RIGHT) #define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT) #define AV_CH_LAYOUT_22POINT2 (AV_CH_LAYOUT_9POINT1POINT6|AV_CH_BACK_CENTER|AV_CH_LOW_FREQUENCY_2|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_CENTER|AV_CH_TOP_BACK_CENTER|AV_CH_BOTTOM_FRONT_CENTER|AV_CH_BOTTOM_FRONT_LEFT|AV_CH_BOTTOM_FRONT_RIGHT) +#if FF_API_CHANNEL_LAYOUT_BACK +/* + * The following layout masks are deprecated and will be removed in + * an upcoming major bump. + */ +#define AV_CH_LAYOUT_5POINT1POINT4_BACK AV_CH_LAYOUT_5POINT1POINT4 +#define AV_CH_LAYOUT_7POINT1POINT4_BACK AV_CH_LAYOUT_7POINT1POINT4 +#define AV_CH_LAYOUT_9POINT1POINT4_BACK AV_CH_LAYOUT_9POINT1POINT4 #define AV_CH_LAYOUT_7POINT1_TOP_BACK AV_CH_LAYOUT_5POINT1POINT2_BACK +#endif enum AVMatrixEncoding { AV_MATRIX_ENCODING_NONE, @@ -421,18 +430,27 @@ typedef struct AVChannelLayout { #define AV_CHANNEL_LAYOUT_5POINT1POINT2_BACK AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_5POINT1POINT2_BACK) #define AV_CHANNEL_LAYOUT_OCTAGONAL AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_OCTAGONAL) #define AV_CHANNEL_LAYOUT_CUBE AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_CUBE) -#define AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK AV_CHANNEL_LAYOUT_MASK(10, AV_CH_LAYOUT_5POINT1POINT4_BACK) +#define AV_CHANNEL_LAYOUT_5POINT1POINT4 AV_CHANNEL_LAYOUT_MASK(10, AV_CH_LAYOUT_5POINT1POINT4) #define AV_CHANNEL_LAYOUT_7POINT1POINT2 AV_CHANNEL_LAYOUT_MASK(10, AV_CH_LAYOUT_7POINT1POINT2) -#define AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK AV_CHANNEL_LAYOUT_MASK(12, AV_CH_LAYOUT_7POINT1POINT4_BACK) +#define AV_CHANNEL_LAYOUT_7POINT1POINT4 AV_CHANNEL_LAYOUT_MASK(12, AV_CH_LAYOUT_7POINT1POINT4) #define AV_CHANNEL_LAYOUT_7POINT2POINT3 AV_CHANNEL_LAYOUT_MASK(12, AV_CH_LAYOUT_7POINT2POINT3) -#define AV_CHANNEL_LAYOUT_9POINT1POINT4_BACK AV_CHANNEL_LAYOUT_MASK(14, AV_CH_LAYOUT_9POINT1POINT4_BACK) +#define AV_CHANNEL_LAYOUT_9POINT1POINT4 AV_CHANNEL_LAYOUT_MASK(14, AV_CH_LAYOUT_9POINT1POINT4) #define AV_CHANNEL_LAYOUT_9POINT1POINT6 AV_CHANNEL_LAYOUT_MASK(16, AV_CH_LAYOUT_9POINT1POINT6) #define AV_CHANNEL_LAYOUT_HEXADECAGONAL AV_CHANNEL_LAYOUT_MASK(16, AV_CH_LAYOUT_HEXADECAGONAL) #define AV_CHANNEL_LAYOUT_BINAURAL AV_CHANNEL_LAYOUT_MASK(2, AV_CH_LAYOUT_BINAURAL) #define AV_CHANNEL_LAYOUT_STEREO_DOWNMIX AV_CHANNEL_LAYOUT_MASK(2, AV_CH_LAYOUT_STEREO_DOWNMIX) #define AV_CHANNEL_LAYOUT_22POINT2 AV_CHANNEL_LAYOUT_MASK(24, AV_CH_LAYOUT_22POINT2) +#if FF_API_CHANNEL_LAYOUT_BACK +/* + * The following layouts are deprecated and will be removed in + * an upcoming major bump. + */ +#define AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK AV_CHANNEL_LAYOUT_5POINT1POINT4 +#define AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK AV_CHANNEL_LAYOUT_7POINT1POINT4 +#define AV_CHANNEL_LAYOUT_9POINT1POINT4_BACK AV_CHANNEL_LAYOUT_9POINT1POINT4 #define AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK AV_CHANNEL_LAYOUT_5POINT1POINT2_BACK +#endif #define AV_CHANNEL_LAYOUT_AMBISONIC_FIRST_ORDER \ { /* .order */ AV_CHANNEL_ORDER_AMBISONIC, \ diff --git a/libavutil/version.h b/libavutil/version.h index d5bf20cf89..b065c39343 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 61 -#define LIBAVUTIL_VERSION_MINOR 5 +#define LIBAVUTIL_VERSION_MINOR 6 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ @@ -109,6 +109,7 @@ #define FF_API_DOVI_L11_INVALID_PROPS (LIBAVUTIL_VERSION_MAJOR < 62) #define FF_API_ASSERT_FPU (LIBAVUTIL_VERSION_MAJOR < 62) #define FF_API_VULKAN_SYNC_QUEUES (LIBAVUTIL_VERSION_MAJOR < 62) +#define FF_API_CHANNEL_LAYOUT_BACK (LIBAVUTIL_VERSION_MAJOR < 62) /** * @} -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
