ffmpeg fixes/changes from cvpcs

2012-03-10 21:07:38 -06:00
parent 220a23f452
commit 0463d3bee7
26 changed files with 5081 additions and 5078 deletions
@@ -9,15 +9,11 @@

 namespace avcodec
 {
-#if defined(MACOSX)
-	#include <ffmpeg/avcodec.h>
-#else
 	extern "C"
 	{
 		#include <libavcodec/avcodec.h> // for avcodec::img_convert
 		#include <libswscale/swscale.h>
 	}
-#endif
 };

 // #define HAVE_THEORAEXP