source: SHVCSoftware/branches/SHM-dev/cfg @ 847

Name	Size	Rev	Age	Author	Last change
../
cfg_extension		815	11 years	seregin	merge with SHM-6-dev branch
per-sequence-svc		713	11 years	seregin	merge with SHM-6-dev
per-sequence-svc-avcbase		752	11 years	seregin	merge cfg files from SHM-6-dev
encoder_intra_he10.cfg	6.8 KB ​	588	11 years	seregin	merge with SHM-5.0-dev
encoder_intra_main10.cfg	6.8 KB ​	595	11 years	seregin	merge with SHM-5.0-dev branch
encoder_intra_main.cfg	6.7 KB ​	595	11 years	seregin	merge with SHM-5.0-dev branch
encoder_lowdelay_he10.cfg	7.4 KB ​	595	11 years	seregin	merge with SHM-5.0-dev branch
encoder_lowdelay_main10.cfg	8.3 KB ​	595	11 years	seregin	merge with SHM-5.0-dev branch
encoder_lowdelay_main.cfg	8.3 KB ​	595	11 years	seregin	merge with SHM-5.0-dev branch
encoder_lowdelay_P_he10.cfg	7.4 KB ​	588	11 years	seregin	merge with SHM-5.0-dev
encoder_lowdelay_P_main10.cfg	8.3 KB ​	595	11 years	seregin	merge with SHM-5.0-dev branch
encoder_lowdelay_P_main.cfg	8.3 KB ​	595	11 years	seregin	merge with SHM-5.0-dev branch
encoder_randomaccess_he10.cfg	8.0 KB ​	588	11 years	seregin	merge with SHM-5.0-dev
encoder_randomaccess_main10.cfg	9.0 KB ​	595	11 years	seregin	merge with SHM-5.0-dev branch
encoder_randomaccess_main.cfg	9.0 KB ​	595	11 years	seregin	merge with SHM-5.0-dev branch
layers.cfg	3.2 KB ​	815	11 years	seregin	merge with SHM-6-dev branch
layers_avcbase.cfg	2.7 KB ​	713	11 years	seregin	merge with SHM-6-dev

Property svn:mergeinfo set to /branches/SHM-1.0-dev/cfg merged eligible /branches/SHM-2.0-dev/cfg merged eligible /branches/SHM-2.0avc-dev/cfg merged eligible /branches/SHM-2.1-dev/cfg merged eligible /branches/SHM-2.1-multilayers-dev/cfg merged eligible /branches/SHM-3.0-dev/cfg merged eligible /branches/SHM-3.1-dev/cfg merged eligible /branches/SHM-4.0-dev/cfg merged eligible /branches/SHM-4.1-dev/cfg merged eligible /branches/SHM-5.0-dev/cfg merged eligible /branches/SHM-6-dev/cfg merged eligible