projects / packages / avidemux.git / blame
| Commit | Line | Data |
|---|---|---|
| 928b4275 AM |
1 | diff -ur avidemux_2.4.3.orig/avidemux/ADM_codecs/ADM_x264.cpp avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp |
| 2 | --- avidemux_2.4.3.orig/avidemux/ADM_codecs/ADM_x264.cpp 2008-10-09 01:45:06.048940024 -0700 | |
| 3 | +++ avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp 2008-10-09 01:49:07.606940126 -0700 | |
| 4 | @@ -109,8 +109,14 @@ | |
| 5 | MKPARAM(i_bframe,MaxBFrame); | |
| 6 | MKPARAM(i_bframe_bias,Bias); | |
| 7 | MKPARAM( b_bframe_pyramid,BasReference ); | |
| 8 | +#if X264_BUILD < 65 | |
| 9 | MKPARAM(analyse. b_bidir_me,BidirME ); | |
| 10 | +#endif | |
| 11 | +#if X264_BUILD >= 63 | |
| 12 | + MKPARAM( i_bframe_adaptive, Adaptative); | |
| 13 | +#else | |
| 14 | MKPARAM( b_bframe_adaptive, Adaptative); | |
| 15 | +#endif | |
| 16 | MKPARAM( analyse.b_weighted_bipred, Weighted); | |
| 17 | MKPARAM( b_cabac , CABAC); | |
| 18 | MKPARAM( analyse.i_trellis, Trellis); | |
| 19 | @@ -118,12 +124,16 @@ | |
| 20 | #define MIN_RDO 6 | |
| 21 | if(zparam->PartitionDecision+1>=MIN_RDO) | |
| 22 | { | |
| 23 | - int rank,parity; | |
| 24 | - rank=((zparam->PartitionDecision+1-MIN_RDO)>>1)+MIN_RDO; | |
| 25 | - parity=(zparam->PartitionDecision+1-MIN_RDO)&1; | |
| 26 | +#if X264_BUILD >= 65 | |
| 27 | + param.analyse.i_subpel_refine = zparam->PartitionDecision + 1; | |
| 28 | +#else | |
| 29 | + int rank,parity; | |
| 30 | + rank=((zparam->PartitionDecision+1-MIN_RDO)>>1)+MIN_RDO; | |
| 31 | + parity=(zparam->PartitionDecision+1-MIN_RDO)&1; | |
| 32 | ||
| 33 | - param.analyse.i_subpel_refine=rank; | |
| 34 | - param.analyse.b_bframe_rdo=parity; | |
| 35 | + param.analyse.i_subpel_refine=rank; | |
| 36 | + param.analyse.b_bframe_rdo=parity; | |
| 37 | +#endif | |
| 38 | } | |
| 39 | MKPARAM(analyse.b_chroma_me,ChromaME); | |
| 40 | MKPARAM(b_deblocking_filter,DeblockingFilter); |