X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.C;h=5a17fde869250aea8744a5cf82f218fdfba289f3;hb=4d2d052cc767103a8699b1de0e3a1f36844ac04f;hp=d8db797b916d868632f89290e8e7b0ca7ae91108;hpb=c66c09b32c6f46ef67550a6c63ba7f9d1d46628d;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/asset.C b/cinelerra-5.1/cinelerra/asset.C index d8db797b..5a17fde8 100644 --- a/cinelerra-5.1/cinelerra/asset.C +++ b/cinelerra-5.1/cinelerra/asset.C @@ -341,14 +341,14 @@ int Asset::equivalent(Asset &asset, int test_audio, int test_video, EDL *edl) 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) {