$NetBSD: patch-ac,v 1.4.10.1 2009/01/14 06:51:14 rtr Exp $

Support for newer x264 snapshots. From upstream SVN.

--- avidemux/ADM_codecs/ADM_x264.cpp.orig	2008-07-21 19:24:20.000000000 +0200
+++ avidemux/ADM_codecs/ADM_x264.cpp
@@ -109,8 +109,14 @@ uint8_t X264Encoder::preamble (uint32_t 
   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 @@ uint8_t X264Encoder::preamble (uint32_t 
 #define MIN_RDO 6
   if(zparam->PartitionDecision+1>=MIN_RDO)
   {
+#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;
+#endif
   }
   MKPARAM(analyse.b_chroma_me,ChromaME);
   MKPARAM(b_deblocking_filter,DeblockingFilter);
