]> git.sesse.net Git - kdenlive/commitdiff
Do not warn over profile mismatch because of image aspect ratio
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Fri, 11 Feb 2011 10:58:39 +0000 (10:58 +0000)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Fri, 11 Feb 2011 10:58:39 +0000 (10:58 +0000)
svn path=/trunk/kdenlive/; revision=5390

src/profilesdialog.cpp

index 15517ec533832ad0ca1b19b5d553af5e5cbec464..557f6f7cdb4352b0cc7f552f0d09f1d4915e20eb 100644 (file)
@@ -411,7 +411,7 @@ bool ProfilesDialog::matchProfile(int width, int height, double fps, double par,
         // when using image, compare with display width
         profileWidth = profile.height * profile.display_aspect_num / profile.display_aspect_den + 0.5;
     } else profileWidth = profile.width;
-    if (width != profileWidth || height != profile.height || (fps > 0 && qAbs((double) profile.frame_rate_num / profile.frame_rate_den - fps) > 0.4) || (par > 0 && qAbs((double) profile.sample_aspect_num / profile.sample_aspect_den - par) > 0.1)) return false;
+    if (width != profileWidth || height != profile.height || (fps > 0 && qAbs((double) profile.frame_rate_num / profile.frame_rate_den - fps) > 0.4) || (!isImage && par > 0 && qAbs((double) profile.sample_aspect_num / profile.sample_aspect_den - par) > 0.1)) return false;
     return true;
 }