Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 240446 | Differences between
and this patch

Collapse All | Expand All

(-)avidemux_2.4.3.orig/avidemux/ADM_codecs/ADM_x264.cpp (-5 / +15 lines)
Lines 109-116 Link Here
109
  MKPARAM(i_bframe,MaxBFrame);
109
  MKPARAM(i_bframe,MaxBFrame);
110
  MKPARAM(i_bframe_bias,Bias);
110
  MKPARAM(i_bframe_bias,Bias);
111
  MKPARAM( b_bframe_pyramid,BasReference );
111
  MKPARAM( b_bframe_pyramid,BasReference );
112
#if X264_BUILD < 65
112
  MKPARAM(analyse. b_bidir_me,BidirME );
113
  MKPARAM(analyse. b_bidir_me,BidirME );
114
#endif
115
#if X264_BUILD >= 63
116
  MKPARAM( i_bframe_adaptive, Adaptative);
117
#else
113
  MKPARAM( b_bframe_adaptive, Adaptative);
118
  MKPARAM( b_bframe_adaptive, Adaptative);
119
#endif
114
  MKPARAM( analyse.b_weighted_bipred, Weighted);
120
  MKPARAM( analyse.b_weighted_bipred, Weighted);
115
  MKPARAM( b_cabac , CABAC);
121
  MKPARAM( b_cabac , CABAC);
116
  MKPARAM( analyse.i_trellis, Trellis);
122
  MKPARAM( analyse.i_trellis, Trellis);
Lines 118-129 Link Here
118
#define MIN_RDO 6
124
#define MIN_RDO 6
119
  if(zparam->PartitionDecision+1>=MIN_RDO)
125
  if(zparam->PartitionDecision+1>=MIN_RDO)
120
  {
126
  {
121
      int rank,parity;
127
#if X264_BUILD >= 65
122
      rank=((zparam->PartitionDecision+1-MIN_RDO)>>1)+MIN_RDO;
128
    param.analyse.i_subpel_refine = zparam->PartitionDecision + 1;
123
      parity=(zparam->PartitionDecision+1-MIN_RDO)&1;
129
#else
130
    int rank,parity;
131
    rank=((zparam->PartitionDecision+1-MIN_RDO)>>1)+MIN_RDO;
132
    parity=(zparam->PartitionDecision+1-MIN_RDO)&1;
124
      
133
      
125
      param.analyse.i_subpel_refine=rank;
134
    param.analyse.i_subpel_refine=rank;
126
      param.analyse.b_bframe_rdo=parity;
135
    param.analyse.b_bframe_rdo=parity;
136
#endif
127
  }
137
  }
128
  MKPARAM(analyse.b_chroma_me,ChromaME);
138
  MKPARAM(analyse.b_chroma_me,ChromaME);
129
  MKPARAM(b_deblocking_filter,DeblockingFilter);
139
  MKPARAM(b_deblocking_filter,DeblockingFilter);

Return to bug 240446