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

Merge branch '116-Bitrate-Switching-in-MC' of... 

Merge branch '116-Bitrate-Switching-in-MC' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 116-Bitrate-Switching-in-MC

# Conflicts:
#	lib_dec/ivas_mct_dec.c
parents ff4d60ee 994b719b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment