This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 29c1349657f72ae72a48306bfdefeebb84570d93 Author: James Almer <[email protected]> AuthorDate: Wed Sep 23 11:04:40 2026 -0300 Commit: James Almer <[email protected]> CommitDate: Sun Sep 27 18:38:11 2026 -0300 avcodec/libmpeghdec: use the new layout defines Signed-off-by: James Almer <[email protected]> --- libavcodec/libmpeghdec.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavcodec/libmpeghdec.c b/libavcodec/libmpeghdec.c index ecc3a2dc09..58a37599a4 100644 --- a/libavcodec/libmpeghdec.c +++ b/libavcodec/libmpeghdec.c @@ -68,14 +68,6 @@ static av_cold int mpegh3dadec_close(AVCodecContext *avctx) // https://github.com/Fraunhofer-IIS/mpeghdec/wiki/MPEG-H-decoder-target-layouts static av_cold int channel_layout_to_cicp(const AVChannelLayout *layout) { -// different from AV_CH_LAYOUT_7POINT2POINT3 -#define CH_LAYOUT_7POINT2POINT3 AV_CH_LAYOUT_5POINT1POINT2 | AV_CH_SIDE_SURROUND_LEFT | \ - AV_CH_SIDE_SURROUND_RIGHT | AV_CH_TOP_BACK_CENTER | \ - AV_CH_LOW_FREQUENCY_2 -#define CH_LAYOUT_5POINT1POINT6 AV_CH_LAYOUT_5POINT1POINT4_BACK | \ - AV_CH_TOP_FRONT_CENTER | AV_CH_TOP_CENTER -#define CH_LAYOUT_7POINT1POINT6 AV_CH_LAYOUT_7POINT1POINT4_BACK | \ - AV_CH_TOP_FRONT_CENTER | AV_CH_TOP_CENTER static const uint64_t channel_layout_masks[] = { 0, AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, @@ -85,9 +77,9 @@ static av_cold int channel_layout_to_cicp(const AVChannelLayout *layout) AV_CH_LAYOUT_2_1, AV_CH_LAYOUT_2_2, AV_CH_LAYOUT_6POINT1, AV_CH_LAYOUT_7POINT1, AV_CH_LAYOUT_22POINT2, AV_CH_LAYOUT_5POINT1POINT2, - CH_LAYOUT_7POINT2POINT3, AV_CH_LAYOUT_5POINT1POINT4_BACK, - CH_LAYOUT_5POINT1POINT6, CH_LAYOUT_7POINT1POINT6, - AV_CH_LAYOUT_7POINT1POINT4_BACK, + AV_CH_LAYOUT_7POINT2POINT3, AV_CH_LAYOUT_5POINT1POINT4, + AV_CH_LAYOUT_5POINT1POINT6, AV_CH_LAYOUT_7POINT1POINT6, + AV_CH_LAYOUT_7POINT1POINT4, }; for (size_t i = 0; i < FF_ARRAY_ELEMS(channel_layout_masks); ++i) { if (channel_layout_masks[i]) { -- 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]
