Fix botched upgrade to VS 2019

yermak · Dec 7, 2020 · 39228ac · 39228ac
1 parent 7299643
commit 39228ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/mp4v2-Win/include/mp4v2/project.h b/mp4v2-Win/include/mp4v2/project.h
@@ -6,17 +6,17 @@
 #define MP4V2_PROJECT_name            "MP4v2"
 #define MP4V2_PROJECT_name_lower      "mp4v2"
 #define MP4V2_PROJECT_name_upper      "MP4V2"
-#define MP4V2_PROJECT_name_formal     "MP4v2 4.1.4.0"
+#define MP4V2_PROJECT_name_formal     "MP4v2 4.1.5.0"
 #define MP4V2_PROJECT_url_website     "http://code.google.com/p/mp4v2"
 #define MP4V2_PROJECT_url_downloads   "http://code.google.com/p/mp4v2/downloads/list"
 #define MP4V2_PROJECT_url_discussion  "http://groups.google.com/group/mp4v2"
 #define MP4V2_PROJECT_irc             "irc://irc.freenode.net/handbrake"
 #define MP4V2_PROJECT_bugreport       "<eddyg@myreflection.org>"
-#define MP4V2_PROJECT_version         "4.1.4.0"
+#define MP4V2_PROJECT_version         "4.1.5.0"
 #define MP4V2_PROJECT_version_hex     0x00020100
 #define MP4V2_PROJECT_version_major   4
 #define MP4V2_PROJECT_version_minor   1
-#define MP4V2_PROJECT_version_point   4
+#define MP4V2_PROJECT_version_point   5
 #define MP4V2_PROJECT_repo_url        "https://mp4v2.googlecode.com/svn/trunk"
 #define MP4V2_PROJECT_repo_root       "https://mp4v2.googlecode.com/svn"
 #define MP4V2_PROJECT_repo_uuid       "6e6572fa-98a6-11dd-ad9f-f77439c74b79"

diff --git a/mp4v2-Win/mp4v2.autopkg b/mp4v2-Win/mp4v2.autopkg
@@ -2,15 +2,15 @@ configurations
 {
    Toolset {
       key : "PlatformToolset";
-      choices: { v142 };
+      choices: { v141 };
    };
 }
 nuget
 {
    nuspec
    {
       id = mp4v2;
-      version: 4.1.4;
+      version: 4.1.5;
       title: MP4v2 Library;
       authors: { TechSmith Corporation };
       owners: { TechSmith Corporation };
@@ -34,7 +34,8 @@ nuget
          4.1.1   (pre-release) Be more tolerant of some MOV-specific quirks
          4.1.2   Finalize changes to handle ProRes MOV files correctly
          4.1.3   ftyp atom optional for MOV files
-         4.1.4   Update to VS 2019; allow parsing of some atoms to be skipped";
+         4.1.4   Update to VS 2019; allow parsing of some atoms to be skipped
+         4.1.5   Revert to VS 2017";
       copyright: "";
       tags: { native, mp4v2, mp4, vs2017 };
    };
@@ -43,7 +44,7 @@ nuget
    {
       nestedInclude:  { #destination = ${d_include}mp4v2; ..\include\mp4v2\*.h };
 
-      ("Win32,x64", "v142", "Debug,Release") =>
+      ("Win32,x64", "v141", "Debug,Release") =>
       {
          [${0},${1},${2}]
          {