From a6bfbb19ace7693adcefc8fc66807de18e02c5af Mon Sep 17 00:00:00 2001
From: "Devin J. Pohly" <djpohly@gmail.com>
Date: Wed, 20 Feb 2013 16:23:04 -0500
Subject: [PATCH] Revert "make PixelFormat a typedef, fixes ffmpeg 1.1 compat"

This reverts commit 4537a66481bc17732d37bf2d9378daa8d2367c59.

Apparently broke build on Windows somehow.
---
 src/arch/ArchHooks/ArchHooks_Unix.cpp         | 2 --
 src/arch/MovieTexture/MovieTexture_FFMpeg.cpp | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/arch/ArchHooks/ArchHooks_Unix.cpp b/src/arch/ArchHooks/ArchHooks_Unix.cpp
index d54eed4e07..d3cd93840e 100644
--- a/src/arch/ArchHooks/ArchHooks_Unix.cpp
+++ b/src/arch/ArchHooks/ArchHooks_Unix.cpp
@@ -21,8 +21,6 @@
 extern "C"
 {
 	#include <libavcodec/avcodec.h>
-	#undef PixelFormat
-	typedef AVPixelFormat PixelFormat;
 }
 #endif
 
diff --git a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
index 44ca5047ad..5d1ba2ea80 100644
--- a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
@@ -16,8 +16,6 @@ namespace avcodec
 		#include <libavformat/avformat.h>
 		#include <libswscale/swscale.h>
 		#include <libavutil/pixdesc.h>
-		#undef PixelFormat
-		typedef AVPixelFormat PixelFormat;
 	}
 };