Author: rathann Update of /cvs/free/rpms/avidemux/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv32052 Modified Files: avidemux.spec Added Files: avidemux-x264.patch Log Message: * Sun Dec 14 2008 Dominik Mierzejewski <rpm at greysector.net> - 2.4.3-8 - Fix build with current x264 avidemux-x264.patch: --- NEW FILE avidemux-x264.patch --- diff -up avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp.x264 avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp --- avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp.x264 2008-07-21 19:24:20.000000000 +0200 +++ avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp 2008-12-14 23:02:00.000000000 +0100 @@ -109,8 +109,7 @@ uint8_t X264Encoder::preamble (uint32_t MKPARAM(i_bframe,MaxBFrame); MKPARAM(i_bframe_bias,Bias); MKPARAM( b_bframe_pyramid,BasReference ); - MKPARAM(analyse. b_bidir_me,BidirME ); - MKPARAM( b_bframe_adaptive, Adaptative); + MKPARAM( i_bframe_adaptive, Adaptative); MKPARAM( analyse.b_weighted_bipred, Weighted); MKPARAM( b_cabac , CABAC); MKPARAM( analyse.i_trellis, Trellis); @@ -123,7 +122,6 @@ uint8_t X264Encoder::preamble (uint32_t parity=(zparam->PartitionDecision+1-MIN_RDO)&1; param.analyse.i_subpel_refine=rank; - param.analyse.b_bframe_rdo=parity; } MKPARAM(analyse.b_chroma_me,ChromaME); MKPARAM(b_deblocking_filter,DeblockingFilter); Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- avidemux.spec 6 Dec 2008 00:48:54 -0000 1.10 +++ avidemux.spec 20 Dec 2008 21:16:46 -0000 1.11 @@ -2,7 +2,7 @@ Name: avidemux Version: 2.4.3 -Release: 7%{?dist}.1 +Release: 8%{?dist} Summary: Graphical video editing and transcoding tool Group: Applications/Multimedia @@ -20,6 +20,7 @@ # http://avidemux.org/admForum/viewtopic.php?id=3991 Patch4: avidemux-2.4.3-ppc.patch #http://bugs.gentoo.org/attachment.cgi?id=160132&action=view +Patch5: avidemux-x264.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-cli = %{version} @@ -118,6 +119,7 @@ %patch2 -b .i18n %patch3 -b .libdca %patch4 -b .ppc +%patch5 -b .x264 %build %cmake @@ -161,6 +163,9 @@ %{_datadir}/applications/*qt*.desktop %changelog +* Sun Dec 14 2008 Dominik Mierzejewski <rpm at greysector.net> - 2.4.3-8 +- Fix build with current x264 + * Fri Dec 5 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-7.1 - Rebuild for 20081202 ffmpeg snapshot