From 267abc205074395e6aabfa0f3c0d452fc4d95268 Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <carlos@ccextractor.org>
Date: Wed, 24 Jan 2018 18:12:26 -0800
Subject: [PATCH] Corrected an issue with the Windows builds after the previous
 merge

---
 src/lib_ccx/ccx_encoders_python.c   | 2 +-
 src/lib_ccx/utility.c               | 2 +-
 windows/ccextractor.vcxproj         | 1 -
 windows/ccextractor.vcxproj.filters | 3 ---
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/lib_ccx/ccx_encoders_python.c b/src/lib_ccx/ccx_encoders_python.c
index ea65acb3..196e61c9 100644
--- a/src/lib_ccx/ccx_encoders_python.c
+++ b/src/lib_ccx/ccx_encoders_python.c
@@ -14,7 +14,7 @@ void Asprintf(char **strp, const char *fmt, ...) {
 
 	if (ret == -1) {
 		printf("Error: Some problem with asprintf return value in extractor.c\nExiting.");
-		exit(500);
+		exit(CCX_COMMON_EXIT_BUG_BUG);
 	}
 }
 
diff --git a/src/lib_ccx/utility.c b/src/lib_ccx/utility.c
index e5cc3cff..5482f298 100644
--- a/src/lib_ccx/utility.c
+++ b/src/lib_ccx/utility.c
@@ -654,7 +654,7 @@ int vasprintf(char **strp, const char *fmt, va_list ap)
 
 	va_copy(tmp_va, ap);
 #ifdef _WIN32
-	len = _vscprintf(fmt, ap1);
+	len = _vscprintf(fmt, ap);
 #else
 	len = vsnprintf(NULL, 0, fmt, tmp_va);
 #endif
diff --git a/windows/ccextractor.vcxproj b/windows/ccextractor.vcxproj
index 9588d498..218dcd7e 100644
--- a/windows/ccextractor.vcxproj
+++ b/windows/ccextractor.vcxproj
@@ -134,7 +134,6 @@
     <ClInclude Include="..\src\freetype\include\freetype\config\ftstdlib.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\extractors\extractor.c" />
     <ClCompile Include="..\src\gpacmp4\box_dump.c" />
     <ClCompile Include="..\src\gpacmp4\hint_track.c" />
     <ClCompile Include="..\src\freetype\gzip\ftgzip.c" />
diff --git a/windows/ccextractor.vcxproj.filters b/windows/ccextractor.vcxproj.filters
index 58ec5e6f..45697b5d 100644
--- a/windows/ccextractor.vcxproj.filters
+++ b/windows/ccextractor.vcxproj.filters
@@ -833,9 +833,6 @@
     <ClCompile Include="..\src\lib_ccx\matroska.c">
       <Filter>Source Files\lib_ccx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\extractors\extractor.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\wrappers\wrapper.c">
       <Filter>Source Files</Filter>
     </ClCompile>