Merge branch 'main' into dlb_mc_160kbps
# Conflicts: # lib_com/bitstream.c # lib_com/ivas_cnst.h # lib_com/ivas_rom_com.c # lib_com/options.h # lib_dec/ivas_cpe_dec.c # lib_dec/ivas_mct_dec.c # lib_enc/ivas_cpe_enc.c # lib_enc/ivas_mct_enc.c
Loading
Please register or sign in to comment