[SCM] FFmpeg packaging branch, master, updated. upstream/0.svn20090119-33-g141ca8c

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f4ccf7458557487275ecd8f8e51f0881a3552790
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 13:32:37 2009 +0100

    build against libxvmc

diff --git a/debian/changelog b/debian/changelog
index 602a6c9..d977d12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ffmpeg-debian (3:0.svn20090119-1) experimental; urgency=low
   * update Vcs-Git tags. Packaging has now moved to git
   * updates to packaging that faciliate building the unstripped and ubuntu
     variants of this package
+  * enable xvmc support
 
   Upstream Changes:
    - SVQ3 watermark decoding support
diff --git a/debian/confflags b/debian/confflags
index 736a664..2c0cc14 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -48,6 +48,7 @@ confflags += --enable-libvorbis
 confflags += --enable-pthreads
 confflags += --disable-stripping
 confflags += --disable-vhook
+confflags += --enable-xvmc
 
 # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
 ifneq ($(DEB_SOURCE),ffmpeg-debian)
@@ -57,7 +58,6 @@ confflags += --enable-libfaac
 confflags += --enable-libx264
 
 ifeq      ($(DEB_HOST_ARCH),i386)
-confflags += --enable-xvmc
 confflags += --enable-vdpau
 else ifeq ($(DEB_HOST_ARCH),amd64)
 confflags += --enable-xvmc
diff --git a/debian/control b/debian/control
index 1a085ca..312a89e 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends: debhelper (>= 5.0.0),
                libvorbis-dev,
                libx11-dev,
                libxext-dev,
+               libxvmc-dev,
                quilt,
                texi2html,
                zlib1g-dev
diff --git a/debian/control.ffmpeg-debian b/debian/control.ffmpeg-debian
index 1a030c5..00e9881 100644
--- a/debian/control.ffmpeg-debian
+++ b/debian/control.ffmpeg-debian
@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 5.0.0),
                libvorbis-dev,
                libx11-dev,
                libxext-dev,
+               libxvmc-dev,
                quilt,
                texi2html,
                zlib1g-dev

-- 
FFmpeg packaging