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

Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into my_maintenance

# Conflicts:
#	scripts/testv/stv16c.pcm
#	scripts/testv/stv16n.pcm
#	scripts/testv/stv1ISM48s.pcm
#	scripts/testv/stv2ISM48s.pcm
#	scripts/testv/stv2OA32c.pcm
#	scripts/testv/stv2OA48c.pcm
#	scripts/testv/stv32c.pcm
#	scripts/testv/stv32n.pcm
#	scripts/testv/stv3ISM48s.pcm
#	scripts/testv/stv3OA32c.pcm
#	scripts/testv/stv3OA48c.pcm
#	scripts/testv/stv48c.pcm
#	scripts/testv/stv4ISM48s.pcm
#	scripts/testv/stv512MC48c.pcm
#	scripts/testv/stv51MC48c.pcm
#	scripts/testv/stv714MC48c.pcm
#	scripts/testv/stv8c.pcm
#	scripts/testv/stv8n.pcm
#	scripts/testv/stvFOA16c.pcm
#	scripts/testv/stvFOA32c.pcm
#	scripts/testv/stvFOA48c.pcm
#	scripts/testv/stvST16c.pcm
#	scripts/testv/stvST16n.pcm
#	scripts/testv/stvST32c.pcm
#	scripts/testv/stvST32n.pcm
#	scripts/testv/stvST48c.pcm
#	scripts/testv/stvST48n.pcm
#	scripts/testv/stv_IVASMASA_1dir1TC.pcm
#	scripts/testv/stv_IVASMASA_1dir1TC_DTX.pcm
#	scripts/testv/stv_IVASMASA_1dir2TC.pcm
#	scripts/testv/stv_IVASMASA_1dir2TC_DTX.pcm
#	scripts/testv/stv_IVASMASA_2dir1TC.pcm
#	scripts/testv/stv_IVASMASA_2dir2TC.pcm
parents d4474e2c 050f3c0c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment