X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.C;h=5a17fde869250aea8744a5cf82f218fdfba289f3;hb=4b91e8a72deb0be3437ef0edd745646e525534d4;hp=3133649b9ae161077c3b1afdb49e8327452c9213;hpb=af2d680fc71d16363f7f7fb7e602cb0c30015ee5;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/asset.C b/cinelerra-5.1/cinelerra/asset.C index 3133649b..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; @@ -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) {