diff mbox series

[FFmpeg-devel,2/7] swresample/matrix: switch internal clean_layout function to not drop high bits

Message ID 20200801110730.30642-3-jeebjp@gmail.com
State Accepted
Commit 2fd8add1ba340d5bde608d2b8843af9a2487589d
Headers show
Series 22.2 channel layout support for AAC decoding | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Jan Ekström Aug. 1, 2020, 11:07 a.m. UTC 
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.
---
 libswresample/rematrix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer Aug. 1, 2020, 6:50 p.m. UTC | #1 
On Sat, Aug 01, 2020 at 02:07:25PM +0300, Jan Ekström wrote:
> 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.
> ---
>  libswresample/rematrix.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

LGTM

thx

[...]
diff mbox series

Patch

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);