summaryrefslogtreecommitdiff
path: root/libswresample
diff options
context:
space:
mode:
authorJan Ekström <jeebjp@gmail.com>2020-08-01 01:52:08 +0300
committerJan Ekström <jeebjp@gmail.com>2020-08-04 00:17:56 +0300
commit2fd8add1ba340d5bde608d2b8843af9a2487589d (patch)
tree3538093c2d1deaf55f8c7f11b514113ef308b086 /libswresample
parent34de0abbe71fa90e874ff902200e5c6c466ba2f6 (diff)
downloadffmpeg-2fd8add1ba340d5bde608d2b8843af9a2487589d.tar.gz
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.
Diffstat (limited to 'libswresample')
-rw-r--r--libswresample/rematrix.c2
1 files changed, 1 insertions, 1 deletions
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);