summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2007-11-17 18:39:26 +0000
committerLuca Barbato <lu_zero@gentoo.org>2007-11-17 18:39:26 +0000
commitdd2a2f71b63a61decb7cd97bf385ecd26bbff493 (patch)
tree6abd7be11179c3929e5c4e37dc4d7a241c8142d2 /media-gfx
parentamd64 stable, bug #199458. (diff)
downloadgentoo-2-dd2a2f71b63a61decb7cd97bf385ecd26bbff493.tar.gz
gentoo-2-dd2a2f71b63a61decb7cd97bf385ecd26bbff493.tar.bz2
gentoo-2-dd2a2f71b63a61decb7cd97bf385ecd26bbff493.zip
Fix texture import from ffmpeg, bug #199448
(Portage version: 2.1.3.19)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/blender/ChangeLog7
-rw-r--r--media-gfx/blender/files/blender-2.44-swscale.patch4
2 files changed, 8 insertions, 3 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index e7b72a2b876f..eb03e62be52e 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/blender
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.124 2007/11/17 15:13:53 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.125 2007/11/17 18:39:26 lu_zero Exp $
+
+ 17 Nov 2007; Luca Barbato <lu_zero@gentoo.org>
+ files/blender-2.44-swscale.patch:
+ Fix texture import from ffmpeg, thanks again to Maciej Pawlik <yaq@world.pl>
+ for fixing the patch in bug #199448
17 Nov 2007; Luca Barbato <lu_zero@gentoo.org> blender-2.45.ebuild:
Fix deps, thanks to Maciej Pawlik <yaq@world.pl> for spotting the issue in
diff --git a/media-gfx/blender/files/blender-2.44-swscale.patch b/media-gfx/blender/files/blender-2.44-swscale.patch
index 4a8df202990e..1982d73b2cfa 100644
--- a/media-gfx/blender/files/blender-2.44-swscale.patch
+++ b/media-gfx/blender/files/blender-2.44-swscale.patch
@@ -92,10 +92,10 @@ index 5b185a4..5cdb651 100644
+ img_convert_ctx = sws_getContext(
+ anim->pCodecCtx->width,
+ anim->pCodecCtx->height,
-+ PIX_FMT_RGBA32,
++ anim->pCodecCtx->pix_fmt,
+ anim->pCodecCtx->width,
+ anim->pCodecCtx->height,
-+ anim->pCodecCtx->pix_fmt,
++ PIX_FMT_RGBA32,
+ SWS_BICUBIC,
+ NULL, NULL, NULL);
+ }