diff --git a/aegisub/FFmpegSource2/ffavisynth.cpp b/aegisub/FFmpegSource2/ffavisynth.cpp
index e63f8a674..cc3899aa2 100644
--- a/aegisub/FFmpegSource2/ffavisynth.cpp
+++ b/aegisub/FFmpegSource2/ffavisynth.cpp
@@ -50,7 +50,7 @@ AvisynthVideoSource::AvisynthVideoSource(const char *SourceFile, int Track, Fram
 	}
 
 	try {
-		InitOutputFormat(VP.VPixelFormat, Env);
+		InitOutputFormat(static_cast<PixelFormat>(VP.VPixelFormat), Env);
 	} catch (AvisynthError &) {
 		FFMS_DestroyVideoSource(VS);
 		throw;
diff --git a/aegisub/FFmpegSource2/ffms.h b/aegisub/FFmpegSource2/ffms.h
index 74fa78fe3..1a8773a91 100644
--- a/aegisub/FFmpegSource2/ffms.h
+++ b/aegisub/FFmpegSource2/ffms.h
@@ -97,7 +97,7 @@ struct VideoProperties {
 	int FPSDenominator;
 	int FPSNumerator;
 	int NumFrames;
-	enum PixelFormat VPixelFormat;
+	int VPixelFormat;
 	int SARNum;
 	int SARDen;
 	int CropTop;
diff --git a/aegisub/FFmpegSource2/ffvideosource.cpp b/aegisub/FFmpegSource2/ffvideosource.cpp
index 9cb7a7710..857535c39 100644
--- a/aegisub/FFmpegSource2/ffvideosource.cpp
+++ b/aegisub/FFmpegSource2/ffvideosource.cpp
@@ -154,7 +154,7 @@ int VideoBase::SetOutputFormat(int TargetFormats, int Width, int Height, char *E
 
 	if (SWS) {
 		FinalFrame = avcodec_alloc_frame();
-		avpicture_alloc((AVPicture *)FinalFrame, VP.VPixelFormat, VP.Width, VP.Height);
+		avpicture_alloc((AVPicture *)FinalFrame, static_cast<PixelFormat>(VP.VPixelFormat), VP.Width, VP.Height);
 	} else {
 		FinalFrame = PPFrame;
 	}
diff --git a/aegisub/FFmpegSource2/utils.cpp b/aegisub/FFmpegSource2/utils.cpp
index 38ff3c5db..9c42be7b6 100644
--- a/aegisub/FFmpegSource2/utils.cpp
+++ b/aegisub/FFmpegSource2/utils.cpp
@@ -177,12 +177,12 @@ typedef struct BITMAPINFOHEADER {
         uint32_t      biClrImportant;
 } BITMAPINFOHEADER;
 
-#endif
-
 #define MAKEFOURCC(ch0, ch1, ch2, ch3)\
 	((uint32_t)(uint8_t)(ch0) | ((uint32_t)(uint8_t)(ch1) << 8) |\
 	((uint32_t)(uint8_t)(ch2) << 16) | ((uint32_t)(uint8_t)(ch3) << 24 ))
 
+#endif
+
 CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate) {
 /* Video Codecs */
 	if (!strcmp(Codec, "V_MS/VFW/FOURCC")) {