diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-11 15:32:38 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-11 15:32:38 -0300 |
| commit | 995dab37c4558447073ea6cb2c6ef7b89849912c (patch) | |
| tree | 1b37cc72fc3a796bfa2856c7f710f978304b3a84 /extra/blender | |
| parent | 20604a1579dcd51b5a46fc7d09cf4b1535219446 (diff) | |
| parent | 1a1b748f1738b1989a834d75b1623be21bf9bab5 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/perl-datetime-format-iso8601/PKGBUILD
extra/kde-agent/PKGBUILD
extra/labplot/PKGBUILD
Diffstat (limited to 'extra/blender')
| -rw-r--r-- | extra/blender/blender-ffmpeg.diff | 13 |
1 files changed, 0 insertions, 13 deletions
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 - |