X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.C;h=5a17fde869250aea8744a5cf82f218fdfba289f3;hb=586cb6f963c4ccc80e79606cf0bbdf9c35171ddc;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..5a17fde8 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,21 +332,23 @@ 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;
+		if( strcmp(apath, tpath) ) result = 0;
 		delete [] apath;
 		delete [] tpath;
 		delete [] out_path;
 	}
 
-	if(result && format == FILE_FFMPEG)
-		result = !strcmp(fformat, asset.fformat);
+	if(result && format == FILE_FFMPEG && strcmp(fformat, asset.fformat) )
+		result = 0;
 
 	if(test_audio && result)
 	{