diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2008-10-16 21:41:10 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2008-10-16 21:41:10 +0000 |
| commit | 93bfca51368260d2719bba6b8114636ed3898880 (patch) | |
| tree | caa37e1bcb22b253cf3bd94f3c7cee1f3e8b2e50 /media-video | |
| parent | Move x11-apps/xkbcomp to DEPEND from RDEPEND. This helps prepare for possible... (diff) | |
| download | gentoo-2-93bfca51368260d2719bba6b8114636ed3898880.tar.gz gentoo-2-93bfca51368260d2719bba6b8114636ed3898880.tar.bz2 gentoo-2-93bfca51368260d2719bba6b8114636ed3898880.zip | |
Adding patch for newer x264 from upstream. Thanks to Tim Harder in bug 240446.
(Portage version: 2.2_rc12_p11688/cvs/Linux 2.6.26-hh3 i686)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/avidemux/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/avidemux/avidemux-2.4.3.ebuild | 4 | ||||
| -rw-r--r-- | media-video/avidemux/files/avidemux-2.4.3-x264.patch | 40 |
3 files changed, 49 insertions, 2 deletions
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog index 6894f93a0d29..a94c167df0df 100644 --- a/media-video/avidemux/ChangeLog +++ b/media-video/avidemux/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/avidemux # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.135 2008/09/24 19:54:04 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.136 2008/10/16 21:41:10 yngwin Exp $ + + 16 Oct 2008; Ben de Groot <yngwin@gentoo.org> + +files/avidemux-2.4.3-x264.patch, avidemux-2.4.3.ebuild: + Adding patch for newer x264 from upstream. Thanks to Tim Harder in bug + 240446. 24 Sep 2008; Ben de Groot <yngwin@gentoo.org> -avidemux-2.4.ebuild, avidemux-2.4.1.ebuild, -avidemux-2.4.2.ebuild, avidemux-2.4.3.ebuild: diff --git a/media-video/avidemux/avidemux-2.4.3.ebuild b/media-video/avidemux/avidemux-2.4.3.ebuild index 0a21dfabf99f..d4e92bb24af3 100644 --- a/media-video/avidemux/avidemux-2.4.3.ebuild +++ b/media-video/avidemux/avidemux-2.4.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.3.ebuild,v 1.2 2008/09/24 19:54:04 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.3.ebuild,v 1.3 2008/10/16 21:41:10 yngwin Exp $ EAPI="1" @@ -67,6 +67,8 @@ src_unpack() { # TODO. Needs to be reported upstream. epatch "${FILESDIR}"/${PN}-2.4-libdca.patch epatch "${FILESDIR}"/${PN}-2.4-i18n.patch + # Upstream patch for newer x264 + epatch "${FILESDIR}"/${P}-x264.patch } src_compile() { diff --git a/media-video/avidemux/files/avidemux-2.4.3-x264.patch b/media-video/avidemux/files/avidemux-2.4.3-x264.patch new file mode 100644 index 000000000000..886b6527689b --- /dev/null +++ b/media-video/avidemux/files/avidemux-2.4.3-x264.patch @@ -0,0 +1,40 @@ +diff -ur avidemux_2.4.3.orig/avidemux/ADM_codecs/ADM_x264.cpp avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp +--- avidemux_2.4.3.orig/avidemux/ADM_codecs/ADM_x264.cpp 2008-10-09 01:45:06.048940024 -0700 ++++ avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp 2008-10-09 01:49:07.606940126 -0700 +@@ -109,8 +109,14 @@ + MKPARAM(i_bframe,MaxBFrame); + MKPARAM(i_bframe_bias,Bias); + MKPARAM( b_bframe_pyramid,BasReference ); ++#if X264_BUILD < 65 + MKPARAM(analyse. b_bidir_me,BidirME ); ++#endif ++#if X264_BUILD >= 63 ++ MKPARAM( i_bframe_adaptive, Adaptative); ++#else + MKPARAM( b_bframe_adaptive, Adaptative); ++#endif + MKPARAM( analyse.b_weighted_bipred, Weighted); + MKPARAM( b_cabac , CABAC); + MKPARAM( analyse.i_trellis, Trellis); +@@ -118,12 +124,16 @@ + #define MIN_RDO 6 + if(zparam->PartitionDecision+1>=MIN_RDO) + { +- int rank,parity; +- rank=((zparam->PartitionDecision+1-MIN_RDO)>>1)+MIN_RDO; +- parity=(zparam->PartitionDecision+1-MIN_RDO)&1; ++#if X264_BUILD >= 65 ++ param.analyse.i_subpel_refine = zparam->PartitionDecision + 1; ++#else ++ int rank,parity; ++ rank=((zparam->PartitionDecision+1-MIN_RDO)>>1)+MIN_RDO; ++ parity=(zparam->PartitionDecision+1-MIN_RDO)&1; + +- param.analyse.i_subpel_refine=rank; +- param.analyse.b_bframe_rdo=parity; ++ param.analyse.i_subpel_refine=rank; ++ param.analyse.b_bframe_rdo=parity; ++#endif + } + MKPARAM(analyse.b_chroma_me,ChromaME); + MKPARAM(b_deblocking_filter,DeblockingFilter); |