Added explicit template argument for use of std::min with argument types unsigned...

diff --git a/ChangeLog b/ChangeLog
index c85518b691ca281376472f23d777e349924d36fa..26d2dcec8e16a1b75bdc39062078aadc2e31e697 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+videolink (1.2.1) unstable; urgency=medium
+
+  * Fixed build failure on 64-bit architectures
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Tue, 10 Jul 2007 19:59:17 +0100
+
 videolink (1.2) unstable; urgency=low
 
   * Removed support for Mozilla 1.7

diff --git a/debian/changelog b/debian/changelog
index ee97b76ac633b021dc270f1573f398a1c5e5f4f7..2b58e033b29cf2a19c930e297194db6aaa908787 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+videolink (1.2.1-1) unstable; urgency=low
+
+  * New upstream version - closes: #432403
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Tue, 10 Jul 2007 19:59:54 +0100
+
 videolink (1.2-1) unstable; urgency=low
 
   * New upstream version - closes: #393201, #428180, #432054

diff --git a/generate_dvd.cpp b/generate_dvd.cpp
index 1d43a9aba9e9527c1dce6ba1a0a23fd8238b4850..d5185c2702e6fa88926800ac62c03429d6df6f86 100644 (file)
--- a/generate_dvd.cpp
+++ b/generate_dvd.cpp
@@ -376,8 +376,9 @@ void dvd_generator::generate(const std::string & output_dir) const
        const unsigned menu_begin = titleset_num * dvdauthor_anonymous_menus_max;
        const unsigned menu_end =
            have_real_menus
-           ? std::min((titleset_num + 1) * dvdauthor_anonymous_menus_max,
-                      menus_.size())
+           ? std::min<unsigned>(
+               (titleset_num + 1) * dvdauthor_anonymous_menus_max,
+               menus_.size())
            : menu_begin + 1;
 
        for (unsigned menu_index = menu_begin;