Merge branch '3gpp_issue_1505_fix' into 'main'

Fix for 3GPP issue 1505: [regression] Encoder crash for McMASA 7.1+4 16kHz...

See merge request !1450