[SCM] blender/master: debian/patches/: #0007 updated

[mfv-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6ea1e8aff1b83aa7cce8489427849d23097651b3
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Mon Mar 12 18:40:02 2012 +0100

    debian/patches/: #0007 updated
    
    This update on the minor version fixes the
    well-known FTBFS issue about libavformat.
    
    Git-Dch: Ignore

diff --git a/debian/patches/0007-fix_FTBFS_with_ffmpeg_from_debian.patch b/debian/patches/0007-fix_FTBFS_with_ffmpeg_from_debian.patch
index e2be5b8..39c2f36 100644
--- a/debian/patches/0007-fix_FTBFS_with_ffmpeg_from_debian.patch
+++ b/debian/patches/0007-fix_FTBFS_with_ffmpeg_from_debian.patch
@@ -28,7 +28,7 @@ index 582086d..156073f 100644
  #define FFMPEG_HAVE_AVIO 1
  #endif
  
-+#if (LIBAVFORMAT_VERSION_MAJOR < 53) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 21))
++#if (LIBAVFORMAT_VERSION_MAJOR < 53) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 22))
 +/* XXX The last check above should be (LIBAVFORMAT_VERSION_MINOR < 2),
 + * look at http://patches.libav.org/patch/3333/ but ffmpeg in Debian is
 + * strange: 53.2.0 should have avformat_alloc_output_context2() but it does

-- 
blender packaging