Added patch to fix ffmpeg problems, -r2 will always use internal ffmpeg, -r3 will use the external if +ffmpeg is used. Don't force to not strip, as it seems to work fine anyway.

Package-Manager: portage-2.0.53

9 files changed, 124 insertions, 248 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index c91598ac9979..790744b12950 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.280 2005/11/29 00:05:40 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.281 2005/12/16 18:05:41 flameeyes Exp $
+
+*xine-lib-1.1.1-r3 (16 Dec 2005)
+*xine-lib-1.1.1-r2 (16 Dec 2005)
+
+  16 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/CVE-2005-4048.patch, -xine-lib-1.1.0-r7.ebuild,
+  -xine-lib-1.1.1.ebuild, -xine-lib-1.1.1-r1.ebuild,
+  +xine-lib-1.1.1-r2.ebuild, +xine-lib-1.1.1-r3.ebuild:
+  Added patch to fix ffmpeg problems, -r2 will always use internal ffmpeg, -r3
+  will use the external if +ffmpeg is used. Don't force to not strip, as it
+  seems to work fine anyway.
 
   29 Nov 2005; Jason Wever <weeve@gentoo.org> xine-lib-1.1.1-r1.ebuild:
   Added ~sparc keyword wrt bug #113107.
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 11161f589d5d..bafa7a5ac4b8 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,17 +1,26 @@
-MD5 53f2056a396a5e49ca12c15a015ecb98 ChangeLog 19083
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d769d5b15849e646a28e4df08f2a215d ChangeLog 19558
+MD5 943fd105ac79aeededd17357690d76bc files/CVE-2005-4048.patch 3426
 MD5 9678227c043f04d5e8561cb6ba80d3e6 files/digest-xine-lib-1.0.1-r4 137
 MD5 33da8deb9637be23cd464aba9c5c4ac4 files/digest-xine-lib-1.1.0 137
 MD5 3d6e1d0e96ea02e463d045cd83e2e32f files/digest-xine-lib-1.1.0-r5 138
-MD5 9ca4799efa33fefe9faaad047fb3dcbb files/digest-xine-lib-1.1.0-r7 138
-MD5 c67420852e94a93aef8edd92271497e0 files/digest-xine-lib-1.1.1 137
-MD5 674191abd0aa33d2c912468714b7c8d0 files/digest-xine-lib-1.1.1-r1 137
+MD5 c67420852e94a93aef8edd92271497e0 files/digest-xine-lib-1.1.1-r2 137
+MD5 674191abd0aa33d2c912468714b7c8d0 files/digest-xine-lib-1.1.1-r3 137
 MD5 51e97df2f6ae538ab33a802eafb10457 files/digest-xine-lib-1_rc8-r2 138
 MD5 cd292167e0ca6e7910e1cf32091e3a27 files/xine-lib-formatstring.patch 315
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 MD5 e8e9ff87a88138924d026c3e5c9dd27a xine-lib-1.0.1-r4.ebuild 7482
 MD5 5aa3700abdfbc432b89a5ac75ae9bc03 xine-lib-1.1.0-r5.ebuild 6820
-MD5 36cffcbea10e76a1963c6da1ddd77fb8 xine-lib-1.1.0-r7.ebuild 6827
 MD5 3e7009cff141eff5526219bfc185ece9 xine-lib-1.1.0.ebuild 7254
-MD5 0189cad2d31556f79811dd213ac3c743 xine-lib-1.1.1-r1.ebuild 7249
-MD5 763b50b7933568c96be6a5b639e2bf69 xine-lib-1.1.1.ebuild 6706
+MD5 4d65d56fb5edc89d1402c048fffa78f8 xine-lib-1.1.1-r2.ebuild 6777
+MD5 662abe62da85db7ba44cc1d2cc0bff75 xine-lib-1.1.1-r3.ebuild 7300
 MD5 8e8e38d54e416b12108a0597f4d0801f xine-lib-1_rc8-r2.ebuild 5288
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDowIJAiZjviIA2XgRAtBvAJ9duxRsCl2QmFlRnB+C943pd6aTWwCgyXZC
+EihV+uqCwYe5Xg4PpQ1C8dU=
+=NgI5
+-----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/CVE-2005-4048.patch b/media-libs/xine-lib/files/CVE-2005-4048.patch
new file mode 100644
index 000000000000..88a481628915
--- /dev/null
+++ b/media-libs/xine-lib/files/CVE-2005-4048.patch
@@ -0,0 +1,87 @@
+Index: libavcodec/utils.c
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/utils.c,v
+retrieving revision 1.161
+retrieving revision 1.162
+diff -u -r1.161 -r1.162
+--- libavcodec/utils.c	2 Nov 2005 09:18:32 -0000	1.161
++++ libavcodec/utils.c	2 Dec 2005 00:12:37 -0000	1.162
+@@ -292,27 +292,10 @@
+         buf->last_pic_num= *picture_number;
+     }else{
+         int h_chroma_shift, v_chroma_shift;
+-        int pixel_size;
+-        
++        int pixel_size, size[3];
++        AVPicture picture;
++
+         avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift);
+-        
+-        switch(s->pix_fmt){
+-        case PIX_FMT_RGB555:
+-        case PIX_FMT_RGB565:
+-        case PIX_FMT_YUV422:
+-        case PIX_FMT_UYVY422:
+-            pixel_size=2;
+-            break;
+-        case PIX_FMT_RGB24:
+-        case PIX_FMT_BGR24:
+-            pixel_size=3;
+-            break;
+-        case PIX_FMT_RGBA32:
+-            pixel_size=4;
+-            break;
+-        default:
+-            pixel_size=1;
+-        }
+ 
+         avcodec_align_dimensions(s, &w, &h);
+             
+@@ -320,21 +303,39 @@
+             w+= EDGE_WIDTH*2;
+             h+= EDGE_WIDTH*2;
+         }
+-        
++        avpicture_fill(&picture, NULL, s->pix_fmt, w, h);
++        pixel_size= picture.linesize[0]*8 / w;
++//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d\n", (int)picture.data[1], w, h, s->pix_fmt);
++        assert(pixel_size>=1);
++            //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it
++        if(pixel_size == 3*8)
++            w= ALIGN(w, STRIDE_ALIGN<<h_chroma_shift);
++        else
++            w= ALIGN(pixel_size*w, STRIDE_ALIGN<<(h_chroma_shift+3)) / pixel_size;
++        size[1] = avpicture_fill(&picture, NULL, s->pix_fmt, w, h);
++        size[0] = picture.linesize[0] * h;
++        size[1] -= size[0];
++        if(picture.data[2])
++            size[1]= size[2]= size[1]/2;
++        else
++            size[2]= 0;
++
+         buf->last_pic_num= -256*256*256*64;
++        memset(buf->base, 0, sizeof(buf->base));
++        memset(buf->data, 0, sizeof(buf->data));
+ 
+-        for(i=0; i<3; i++){
++        for(i=0; i<3 && size[i]; i++){
+             const int h_shift= i==0 ? 0 : h_chroma_shift;
+             const int v_shift= i==0 ? 0 : v_chroma_shift;
+ 
+-            //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it
+-            buf->linesize[i]= ALIGN(pixel_size*w>>h_shift, STRIDE_ALIGN<<(h_chroma_shift-h_shift)); 
++            buf->linesize[i]= picture.linesize[i];
+ 
+-            buf->base[i]= av_malloc((buf->linesize[i]*h>>v_shift)+16); //FIXME 16
++            buf->base[i]= av_malloc(size[i]+16); //FIXME 16
+             if(buf->base[i]==NULL) return -1;
+-            memset(buf->base[i], 128, buf->linesize[i]*h>>v_shift);
+-        
+-            if(s->flags&CODEC_FLAG_EMU_EDGE)
++            memset(buf->base[i], 128, size[i]);
++
++            // no edge if EDEG EMU or not planar YUV, we check for PAL8 redundantly to protect against a exploitable bug regression ...
++            if((s->flags&CODEC_FLAG_EMU_EDGE) || (s->pix_fmt == PIX_FMT_PAL8) || !size[2]) 
+                 buf->data[i] = buf->base[i];
+             else
+                 buf->data[i] = buf->base[i] + ALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), STRIDE_ALIGN);
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r7 b/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r7
deleted file mode 100644
index d5563942e83b..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3537cfd58d253b4be20a4975e7086e38 xine-lib-1.1.0.tar.gz 8036882
-MD5 4148ba998c6cc50e81a3dfd2168399f9 xine-lib-patches-16.tar.bz2 14248
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.1 b/media-libs/xine-lib/files/digest-xine-lib-1.1.1-r2
index eb065c5276b8..eb065c5276b8 100644
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.1
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.1-r2
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.1-r1 b/media-libs/xine-lib/files/digest-xine-lib-1.1.1-r3
index 3d8048790f86..3d8048790f86 100644
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.1-r1
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.1-r3
diff --git a/media-libs/xine-lib/xine-lib-1.1.0-r7.ebuild b/media-libs/xine-lib/xine-lib-1.1.0-r7.ebuild
deleted file mode 100644
index 1e490aaaa8d2..000000000000
--- a/media-libs/xine-lib/xine-lib-1.1.0-r7.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.0-r7.ebuild,v 1.3 2005/11/22 10:34:43 flameeyes Exp $
-
-inherit eutils flag-o-matic toolchain-funcs libtool autotools
-
-# This should normally be empty string, unless a release has a suffix.
-MY_PKG_SUFFIX=""
-MY_P=${PN}-${PV/_/-}${MY_PKG_SUFFIX}
-
-PATCHLEVEL="16"
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="aalib libcaca arts cle266 esd win32codecs nls dvd X directfb vorbis alsa
-gnome sdl speex theora ipv6 altivec opengl aac fbcon xv xvmc nvidia i8x0
-samba dxr3 vidix mng flac oss v4l xinerama vcd a52 mad imagemagick dts ffmpeg"
-RESTRICT="nostrip"
-
-RDEPEND="vorbis? ( media-libs/libvorbis )
-	X? ( || ( (
-			x11-libs/libXext
-			x11-libs/libX11 )
-		virtual/x11 ) )
-	xv? ( || ( x11-libs/libXv virtual/x11 ) )
-	xvmc? (
-		|| ( x11-libs/libXvMC virtual/x11 )
-		nvidia? ( media-video/nvidia-glx )
-		cle266? ( || ( x11-drivers/xf86-video-via virtual/x11 ) )
-		i8x0? ( || ( x11-drivers/xf86-video-i810 virtual/x11 ) ) )
-	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )
-	win32codecs? ( >=media-libs/win32codecs-0.50 )
-	esd? ( media-sound/esound )
-	dvd? ( >=media-libs/libdvdcss-1.2.7 )
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	directfb? ( >=dev-libs/DirectFB-0.9.9 )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	flac? ( >=media-libs/flac-1.0.4 )
-	sdl? ( >=media-libs/libsdl-1.1.5 )
-	dxr3? ( >=media-libs/libfame-0.9.0 )
-	theora? ( media-libs/libtheora )
-	speex? ( media-libs/speex )
-	libcaca? ( media-libs/libcaca )
-	samba? ( net-fs/samba )
-	mng? ( media-libs/libmng )
-	vcd? ( media-video/vcdimager )
-	a52? ( >=media-libs/a52dec-0.7.4-r5 )
-	mad? ( media-libs/libmad )
-	imagemagick? ( media-gfx/imagemagick )
-	dts? ( media-libs/libdts )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050906 )
-	!=media-libs/xine-lib-0.9.13*"
-
-DEPEND="${RDEPEND}
-	X? ( || ( (
-			x11-base/xorg-server
-			x11-libs/libXt
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/videoproto
-			x11-proto/xf86vidmodeproto )
-		virtual/x11 )
-		)
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
-	v4l? ( virtual/os-headers )
-	dev-util/pkgconfig
-	>=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.59
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patches/
-	epatch ${FILESDIR}/xine-lib-formatstring.patch
-
-	AT_M4DIR="m4" eautoreconf
-	elibtoolize
-}
-
-# check for the X11 path for a given library
-get_x11_dir() {
-	if [[ -f "${ROOT}/usr/$(get_libdir)/$1" ]]; then
-		echo "${ROOT}/usr/$(get_libdir)"
-	elif [[ -f "${ROOT}/usr/$(get_libdir)/xorg/$1" ]]; then
-		echo "${ROOT}/usr/$(get_libdir)/xorg"
-	elif [[ -f "${ROOT}/usr/X11R6/$(get_libdir)/$1" ]]; then
-		echo "${ROOT}/usr/X11R6/$(get_libdir)"
-	fi
-}
-
-src_compile() {
-	#prevent quicktime crashing
-	append-flags -frename-registers -ffunction-sections
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		has_pic && append-flags -UHAVE_MMX
-		filter-flags -fforce-addr  # breaks ffmpeg module
-		filter-flags -momit-leaf-frame-pointer # break on gcc 3.4/4.x
-		append-flags -mno-sse -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-
-		ewarn ""
-		ewarn "Debug information will be almost useless as the frame pointer is omitted."
-		ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-		ewarn "difficult to fix. Please have that in mind."
-		ewarn ""
-	fi
-
-	append-lfs-flags
-
-	local myconf
-
-	# the win32 codec path should ignore $(get_libdir) and always use lib
-	use win32codecs \
-		&& myconf="${myconf} --with-w32-path=/usr/$(get_libdir)/win32" \
-		|| myconf="${myconf} --disable-asf"
-
-	# enable/disable appropiate optimizations on sparc
-	[[ "${PROFILE_ARCH}" == "sparc64" ]] && myconf="${myconf} --enable-vis"
-	[[ "${PROFILE_ARCH}" == "sparc" ]] && myconf="${myconf} --disable-vis"
-
-	# The default CFLAGS (-O) is the only thing working on hppa.
-	use hppa && unset CFLAGS
-
-	if use xvmc; then
-		count="0"
-		if use nvidia; then
-			count="`expr ${count} + 1`"
-			xvmclib="XvMCNVIDIA"
-		fi
-
-		if use i8x0; then
-			count="`expr ${count} + 1`"
-			xvmclib="I810XvmC"
-		fi
-
-		if use cle266; then
-			count="`expr ${count} + 1`"
-			xvmclib="viaXvMC"
-		fi
-
-		if [[ "${count}" -gt "1" ]]; then
-			eerror "Invalid combination of USE flags"
-			eerror "When building support for xvmc, you may only include support for one video card:"
-			eerror "   nvidia, i8x0, cle266"
-			eerror ""
-			eerror "XvMC support will not be built."
-		elif [[ -n "${xvmclib}" ]]; then
-			xvmcconf="--with-xvmc-lib=${xvmclib} --with-xxmc-lib=${xvmclib}"
-			xvmcdir=$(get_x11_dir libXvMC.so)
-
-			[[ -z ${xvmcdir} ]] && die "Unable to find libXvMC.so."
-
-			myconf="${myconf} ${xvmcconf} --with-xvmc-path=${xvmcdir} --with-xxmc-path=${xvmcdir}"
-		fi
-	fi
-
-	if use xv; then
-		xvdir=$(get_x11_dir libXv.so)
-
-		[[ -z ${xvdir} ]] && die "Unable to find libXv.so. Did you set USE=\"xv\" when you emerged xorg-x11?"
-
-		myconf="${myconf} --with-xv-path=${xvdir}"
-	fi
-
-	econf \
-		$(use_enable gnome) \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_enable samba) \
-		$(use_enable altivec) \
-		\
-		$(use_enable mng) \
-		$(use_enable imagemagick) \
-		\
-		$(use_enable aac faad) \
-		$(use_enable flac) \
-		$(use_with vorbis ogg) $(use_with vorbis) \
-		$(use_enable speex) \
-		$(use_enable a52) --with-external-a52dec \
-		$(use_enable mad) --with-external-libmad \
-		$(use_enable dts) --with-external-libdts \
-		\
-		$(use_with X x) \
-		$(use_enable xinerama) \
-		$(use_enable vidix) \
-		$(use_enable dxr3) \
-		$(use_enable directfb) \
-		$(use_enable fbcon fb) \
-		$(use_enable opengl) \
-		$(use_enable aalib) \
-		$(use_enable libcaca caca) \
-		$(use_enable sdl) \
-		\
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		$(use_enable arts) \
-		$(use_enable esd) \
-		$(use_enable vcd) --without-internal-vcdlibs \
-		--disable-polypaudio \
-		--disable-optimizations \
-		$(use_with ffmpeg external-ffmpeg) \
-		${myconf} \
-		--disable-dependency-tracking || die "econf failed"
-
-		#$(use_with dvdnav external-dvdnav) \
-		#$(use_enable macos macosx-video) $(use_enable macos coreaudio) \
-		# This will be added when polypaudio will be added to portage.
-		# $(use_enable polypaudio)
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-
-	dodoc AUTHORS ChangeLog README TODO doc/README* doc/faq/faq.txt
-	dohtml doc/faq/faq.html doc/hackersguide/*.html doc/hackersguide/*.png
-
-	rm -rf ${D}/usr/share/doc/xine
-}
diff --git a/media-libs/xine-lib/xine-lib-1.1.1.ebuild b/media-libs/xine-lib/xine-lib-1.1.1-r2.ebuild
index aa3d0ba9ec4a..58727af395f4 100644
--- a/media-libs/xine-lib/xine-lib-1.1.1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.1.ebuild,v 1.2 2005/11/22 10:34:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.1-r2.ebuild,v 1.1 2005/12/16 18:05:41 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -86,6 +86,9 @@ src_unpack() {
 
 	# AT_M4DIR="m4" eautoreconf
 	elibtoolize
+
+	cd "${S}/src/libffmpeg"
+	epatch "${FILESDIR}/CVE-2005-4048.patch"
 }
 
 # check for the X11 path for a given library
diff --git a/media-libs/xine-lib/xine-lib-1.1.1-r1.ebuild b/media-libs/xine-lib/xine-lib-1.1.1-r3.ebuild
index e9ff7cd47c77..edbd0a91d33e 100644
--- a/media-libs/xine-lib/xine-lib-1.1.1-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.1-r1.ebuild,v 1.12 2005/11/29 00:05:40 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.1-r3.ebuild,v 1.1 2005/12/16 18:05:41 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -22,7 +22,6 @@ IUSE="aalib libcaca arts cle266 esd win32codecs nls dvd X directfb vorbis alsa
 gnome sdl speex theora ipv6 altivec opengl aac fbcon xv xvmc nvidia i8x0
 samba dxr3 vidix mng flac oss v4l xinerama vcd a52 mad imagemagick dts asf
 ffmpeg debug"
-RESTRICT="nostrip"
 
 RDEPEND="vorbis? ( media-libs/libvorbis )
 	X? ( || ( (
@@ -57,7 +56,7 @@ RDEPEND="vorbis? ( media-libs/libvorbis )
 	mad? ( media-libs/libmad )
 	imagemagick? ( media-gfx/imagemagick )
 	dts? ( media-libs/libdts )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20051120 )
+	ffmpeg? ( ~media-video/ffmpeg-0.4.9_p20051120 )
 	!=media-libs/xine-lib-0.9.13*"
 
 DEPEND="${RDEPEND}
@@ -90,6 +89,9 @@ src_unpack() {
 
 	AT_M4DIR="m4" eautoreconf
 	elibtoolize
+
+	cd "${S}/src/libffmpeg"
+	epatch "${FILESDIR}/CVE-2005-4048.patch"
 }
 
 # check for the X11 path for a given library