From 1a1b748f1738b1989a834d75b1623be21bf9bab5 Mon Sep 17 00:00:00 2001 From: Parabola Date: Mon, 11 Jul 2011 18:35:04 +0000 Subject: Mon Jul 11 18:34:51 UTC 2011 --- extra/blender/blender-ffmpeg.diff | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 extra/blender/blender-ffmpeg.diff (limited to 'extra/blender') diff --git a/extra/blender/blender-ffmpeg.diff b/extra/blender/blender-ffmpeg.diff deleted file mode 100644 index ffef489e2..000000000 --- a/extra/blender/blender-ffmpeg.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: intern/ffmpeg/ffmpeg_compat.h -=================================================================== ---- intern/ffmpeg/ffmpeg_compat.h (revision 37744) -+++ intern/ffmpeg/ffmpeg_compat.h (revision 37745) -@@ -40,7 +40,7 @@ - #define FFMPEG_HAVE_AVIO 1 - #endif - --#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) -+#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 122)) - #define FFMPEG_HAVE_DEFAULT_VAL_UNION 1 - #endif - -- cgit v1.2.3-54-g00ecf