diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2011-07-01 04:58:03 +0000 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2011-07-01 04:58:03 +0000 |
| commit | 76400556d9e8a5dedc692487c13b76a541813a23 (patch) | |
| tree | fb8b06b7dea0e79577a77e3748ed551d9ac1b34b /testing/blender/blender-ffmpeg.diff | |
| parent | 64e72407414ce0badfb541782125cd8e3a25c12e (diff) | |
Fri Jul 1 04:58:02 UTC 2011
Diffstat (limited to 'testing/blender/blender-ffmpeg.diff')
| -rw-r--r-- | testing/blender/blender-ffmpeg.diff | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/testing/blender/blender-ffmpeg.diff b/testing/blender/blender-ffmpeg.diff deleted file mode 100644 index ffef489e2..000000000 --- a/testing/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 - |