From 2a12c21daa5b9a79f0b5bfd932f66f2fed3e4cf0 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Wed, 2 Mar 2011 16:57:34 -0600
Subject: [PATCH] apply Tatsh's patch from
 http://ssc.ajworld.net/sm-ssc/bugtracker/view.php?id=218

---
 Docs/credits.txt                              | 4 ++++
 src/arch/MovieTexture/MovieTexture_FFMpeg.cpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Docs/credits.txt b/Docs/credits.txt
index 2daa02afa0..ff068464c3 100644
--- a/Docs/credits.txt
+++ b/Docs/credits.txt
@@ -109,6 +109,10 @@ juanelote
 NitroX72
  * Pump/frame noteskin
 
+Tatsh
+ * A patch to fix building with system ffmpeg
+ (http://ssc.ajworld.net/sm-ssc/bugtracker/view.php?id=218)
+
 ==the beta testers==
 [SSC Beta Testing Team]
 KeithD
diff --git a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
index 14a13567b6..1f5e0f0be7 100644
--- a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
@@ -685,7 +685,7 @@ int URLRageFile_read( avcodec::URLContext *h, unsigned char *buf, int size )
 	return f->Read( buf, size );
 }
 
-int URLRageFile_write( avcodec::URLContext *h, unsigned char *buf, int size )
+int URLRageFile_write( avcodec::URLContext *h, const unsigned char *buf, int size )
 {
 	RageFileBasic *f = (RageFileBasic *) h->priv_data;
 	return f->Write( buf, size );