From 8b7ec4c5dd2078a78178dcc6c5125e9fd8391c23 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu Date: Wed, 8 Dec 2021 16:53:43 +0300 Subject: [PATCH 02/15] Fix ffmpeg 4.4 bluray lpcm patch for 5.1 ? --- cinelerra-5.1/thirdparty/src/ffmpeg-4.4.patch_9 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg-4.4.patch_9 b/cinelerra-5.1/thirdparty/src/ffmpeg-4.4.patch_9 index 717f0bd3..f973f2fc 100644 --- a/cinelerra-5.1/thirdparty/src/ffmpeg-4.4.patch_9 +++ b/cinelerra-5.1/thirdparty/src/ffmpeg-4.4.patch_9 @@ -1,6 +1,6 @@ --- /dev/null 2021-12-05 17:02:04.576000000 +0300 -+++ ./libavcodec/pcm-bluenc.c 2021-12-08 13:28:00.778956966 +0300 -@@ -0,0 +1,330 @@ ++++ ./libavcodec/pcm-bluenc.c 2021-12-08 16:22:32.519865993 +0300 +@@ -0,0 +1,332 @@ +/* + * LPCM codecs for PCM formats found in Blu-ray m2ts streams + * Copyright (c) 2018 Paul B Mahol @@ -128,6 +128,7 @@ + ch_layout = 3; + break; + case AV_CH_LAYOUT_5POINT1: ++ case AV_CH_LAYOUT_5POINT1_BACK: + ch_layout = 9; + break; + case AV_CH_LAYOUT_7POINT1: @@ -324,6 +325,7 @@ + .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, + AV_CH_LAYOUT_STEREO, + AV_CH_LAYOUT_5POINT1, ++ AV_CH_LAYOUT_5POINT1_BACK, + AV_CH_LAYOUT_7POINT1, + 0 }, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, -- 2.34.1