Skip to content
Commit 327a2086 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch 'origin/main' into 984-omasa-ext-output-for-non-disc-modes 

# Conflicts:
#	lib_dec/ivas_jbm_dec.c
#	lib_dec/ivas_omasa_dec.c
parents c56ee4c9 616854b7