[FFmpeg-cvslog] swresample/matrix: switch internal clean_layout function to not drop high bits

[Jan Ekström]

ffmpeg | branch: master | Jan Ekström <jeebjp at gmail.com> | Sat Aug  1 01:52:08 2020 +0300| [2fd8add1ba340d5bde608d2b8843af9a2487589d] | committer: Jan Ekström

swresample/matrix: switch internal clean_layout function to not drop high bits

These bits are utilized by channel layouts such as 22.2. If those
are dropped, the returned channel layout is no longer a match
against the AV_CH_LAYOUT define when returned from this function.

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

 libswresample/rematrix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index 6b5feaa07b..983355ba36 100644
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
@@ -88,7 +88,7 @@ static int even(int64_t layout){
     return 0;
 }
 
-static int clean_layout(void *s, int64_t layout){
+static int64_t clean_layout(void *s, int64_t layout){
     if(layout && layout != AV_CH_FRONT_CENTER && !(layout&(layout-1))) {
         char buf[128];
         av_get_channel_layout_string(buf, sizeof(buf), -1, layout);