Skip to content
Commit e5ab4419 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch...

Merge remote-tracking branch 'remotes/origin/133-bitrate-switching-in-core-coder' into 114-bitrate-switching-in-sba

# Conflicts:
#	lib_dec/ivas_sba_dec.c
#	lib_enc/ivas_sba_enc.c
parents 701eb9cb c664f705
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment