Merge branch '1984-crash-in-basop-encoder-ism4-190kbps' into 'main'

possible fix for 1984-crash-in-basop-encoder-ism4-190kbps

Closes #1984

See merge request !2189