summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-09-22 21:55:55 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-09-22 21:55:55 +0000
commita6eef74a51a9e1aff44a9d3071ade9e06e826631 (patch)
tree785226037622f8a215741246d476e2ea91a3c5d5
parentremove old gwenhywfar ebuilds (diff)
downloadgentoo-2-a6eef74a51a9e1aff44a9d3071ade9e06e826631.tar.gz
gentoo-2-a6eef74a51a9e1aff44a9d3071ade9e06e826631.tar.bz2
gentoo-2-a6eef74a51a9e1aff44a9d3071ade9e06e826631.zip
It seems I was a bit too quick at backporting the patch. Fix it now.
(Portage version: 2.2_rc9/cvs/Linux 2.6.26.5 x86_64)
-rw-r--r--media-libs/libquicktime/ChangeLog6
-rw-r--r--media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch2
2 files changed, 6 insertions, 2 deletions
diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 1133e82ae402..7d0f41201204 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libquicktime
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.122 2008/09/22 19:56:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.123 2008/09/22 21:55:54 aballier Exp $
+
+ 22 Sep 2008; Alexis Ballier <aballier@gentoo.org>
+ files/libquicktime-1.0.3-x264lavc.patch:
+ It seems I was a bit too quick at backporting the patch. Fix it now.
22 Sep 2008; Alexis Ballier <aballier@gentoo.org>
+files/libquicktime-1.0.3-x264lavc.patch, libquicktime-1.0.3.ebuild:
diff --git a/media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch b/media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch
index 709e614c94ca..aeb19ebea017 100644
--- a/media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch
+++ b/media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch
@@ -182,7 +182,7 @@ diff -u -B -r1.23 -r1.24
INTPARAM("x264_i_bframe", codec->params.i_bframe);
- INTPARAM("x264_b_bframe_adaptive", codec->params.b_bframe_adaptive);
+#if X264_BUILD < 63
-+ INTPARAM("x264_b_bframe_adaptive", codec->params.b_bframe_adaptives);
++ INTPARAM("x264_b_bframe_adaptive", codec->params.b_bframe_adaptive);
+#else
+ ENUMPARAM("x264_i_bframe_adaptive", codec->params.i_bframe_adaptive, bframe_adaptives);
+#endif