X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.C;h=d8db797b916d868632f89290e8e7b0ca7ae91108;hb=77815ec03df6a03ed75433e8cf8ae1e83fb76d6e;hp=fd17a1422a89b9bfdcca138e25f47ab5085b9f85;hpb=101d92b4c50a831fb00edd65df57de41b408c7b6;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/asset.C b/cinelerra-5.1/cinelerra/asset.C index fd17a142..d8db797b 100644 --- a/cinelerra-5.1/cinelerra/asset.C +++ b/cinelerra-5.1/cinelerra/asset.C @@ -88,7 +88,7 @@ int Asset::init_values() ff_video_options[0] = 0; ff_audio_bitrate = 0; ff_video_bitrate = 0; - ff_video_quality = 0; + ff_video_quality = -1; jpeg_quality = 80; aspect_ratio = -1; @@ -332,11 +332,13 @@ int Asset::equivalent(Asset &asset, int test_audio, int test_video, EDL *edl) if( out_path ) { if( *apath != '/' ) { char *cp = cstrcat(2, out_path, apath); - delete [] apath; apath = cp; + delete [] apath; apath = FileSystem::basepath(cp); + delete [] cp; } if( *tpath != '/' ) { char *cp = cstrcat(2, out_path, tpath); - delete [] tpath; tpath = cp; + delete [] tpath; tpath = FileSystem::basepath(cp); + delete [] cp; } } if( strcmp(apath, tpath) ) result = 1;