diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-26 15:13:41 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-26 15:13:41 -0500 |
| commit | d26fb8dc20ba3b0e6ef535761b3ac5fd8e7b7c70 (patch) | |
| tree | ae84713aa59e8e2eaa4a2a19db89294ea0b4c1cf /testing/blender/blender-ffmpeg.diff | |
| parent | 2095d71af1b9e0c1dff405c178a9481d1020ca3e (diff) | |
| parent | 8999fa1750304fb2367fb7743e49e013405e88be (diff) | |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el
Conflicts:
community/distcc/PKGBUILD
community/lxtask/PKGBUILD
community/ushare/PKGBUILD
extra/catdoc/PKGBUILD
extra/curl/PKGBUILD
extra/ethstatus/PKGBUILD
extra/ffcall/PKGBUILD
extra/gimp-dbp/PKGBUILD
extra/gimp-refocus/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/metacity/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/x2x/PKGBUILD
libre/kernel26-libre/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/wine/PKGBUILD
testing/alex/PKGBUILD
testing/ghc/PKGBUILD
testing/haskell-cgi/PKGBUILD
testing/haskell-deepseq/PKGBUILD
testing/haskell-fgl/PKGBUILD
testing/haskell-glut/PKGBUILD
testing/haskell-haskell-src/PKGBUILD
testing/haskell-html/PKGBUILD
testing/haskell-http/PKGBUILD
testing/haskell-hunit/PKGBUILD
testing/haskell-mtl/PKGBUILD
testing/haskell-network/PKGBUILD
testing/haskell-opengl/PKGBUILD
testing/haskell-parallel/PKGBUILD
testing/haskell-parsec/PKGBUILD
testing/haskell-platform/PKGBUILD
testing/haskell-quickcheck/PKGBUILD
testing/haskell-regex-base/PKGBUILD
testing/haskell-regex-compat/PKGBUILD
testing/haskell-regex-posix/PKGBUILD
testing/haskell-stm/PKGBUILD
testing/haskell-syb/PKGBUILD
testing/haskell-text/PKGBUILD
testing/haskell-transformers/PKGBUILD
testing/haskell-xhtml/PKGBUILD
testing/haskell-zlib/PKGBUILD
testing/perl/ChangeLog
testing/perl/PKGBUILD
testing/perl/perlbin.sh
testing/pidgin/PKGBUILD
testing/spamassassin/PKGBUILD
Diffstat (limited to 'testing/blender/blender-ffmpeg.diff')
| -rw-r--r-- | testing/blender/blender-ffmpeg.diff | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/testing/blender/blender-ffmpeg.diff b/testing/blender/blender-ffmpeg.diff new file mode 100644 index 000000000..ffef489e2 --- /dev/null +++ b/testing/blender/blender-ffmpeg.diff @@ -0,0 +1,13 @@ +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 + |