From 4537a66481bc17732d37bf2d9378daa8d2367c59 Mon Sep 17 00:00:00 2001
From: "Devin J. Pohly" <djpohly@gmail.com>
Date: Wed, 20 Feb 2013 15:29:24 -0500
Subject: [PATCH] make PixelFormat a typedef, fixes ffmpeg 1.1 compat

---
 src/arch/ArchHooks/ArchHooks_Unix.cpp         | 2 ++
 src/arch/MovieTexture/MovieTexture_FFMpeg.cpp | 2 ++
 2 files changed, 4 insertions(+)

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