From b0798c05ace57a9052c2d32c115b8f108d9471a1 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Fri, 21 May 2010 20:50:01 -0500
Subject: [PATCH] corec's changes from
 http://github.com/corec/cc-overlay/blob/master/games-arcade/sm-ssc/files/sm-ssc-ffmpeg-fixes-01.patch

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

diff --git a/src/arch/ArchHooks/ArchHooks_Unix.cpp b/src/arch/ArchHooks/ArchHooks_Unix.cpp
index 135841e127..ab018f1d90 100644
--- a/src/arch/ArchHooks/ArchHooks_Unix.cpp
+++ b/src/arch/ArchHooks/ArchHooks_Unix.cpp
@@ -20,7 +20,7 @@
 #if defined(HAVE_FFMPEG)
 extern "C"
 {
-	#include <ffmpeg/libavcodec/avcodec.h>
+	#include <libavcodec/avcodec.h>
 }
 #endif
 
diff --git a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
index 5f98223fa5..31a07a996e 100644
--- a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
@@ -695,7 +695,7 @@ int URLRageFile_write( avcodec::URLContext *h, unsigned char *buf, int size )
 #if defined(MACOSX)
 	avcodec::offset_t URLRageFile_seek( avcodec::URLContext *h, avcodec::offset_t pos, int whence )
 #else
-	avcodec::int64_t URLRageFile_seek( avcodec::URLContext *h, avcodec::int64_t pos, int whence )
+	int64_t URLRageFile_seek( avcodec::URLContext *h, avcodec::int64_t pos, int whence )
 #endif
 {
 	RageFileBasic *f = (RageFileBasic *) h->priv_data;