diff -ru mplayer-1.0_rc2_p27725.orig/libavcodec/libx264.c mplayer-1.0_rc2_p27725/libavcodec/libx264.c --- mplayer-1.0_rc2_p27725.orig/libavcodec/libx264.c 2008-10-06 21:04:25.000000000 -0400 +++ mplayer-1.0_rc2_p27725/libavcodec/libx264.c 2008-10-16 15:14:54.945469559 -0400 @@ -162,7 +162,11 @@ x4->params.i_bframe = avctx->max_b_frames; x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; +#if X264_BUILD > 62 x4->params.i_bframe_adaptive = avctx->b_frame_strategy; +#else + x4->params.b_bframe_adaptive = avctx->b_frame_strategy; +#endif x4->params.i_bframe_bias = avctx->bframebias; x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID; avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames; @@ -227,6 +231,10 @@ x4->params.analyse.i_me_range = avctx->me_range; x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality; +#if X264_BUILD < 65 + x4->params.analyse.b_bidir_me = avctx->bidir_refine > 0; + x4->params.analyse.b_bframe_rdo = avctx->flags2 & CODEC_FLAG2_BRDO; +#endif x4->params.analyse.b_mixed_references = avctx->flags2 & CODEC_FLAG2_MIXED_REFS; x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA;