From 2517bc1e7c139c464056d7e4e53faf03cbfb0c77 Mon Sep 17 00:00:00 2001 From: bjs Date: Thu, 18 Dec 2008 16:44:27 +0000 Subject: Add patch for new x264. --- multimedia/mplayer-share/patches/patch-ao | 41 +++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 multimedia/mplayer-share/patches/patch-ao diff --git a/multimedia/mplayer-share/patches/patch-ao b/multimedia/mplayer-share/patches/patch-ao new file mode 100644 index 00000000000..f4221a9d2d0 --- /dev/null +++ b/multimedia/mplayer-share/patches/patch-ao @@ -0,0 +1,41 @@ +$NetBSD: patch-ao,v 1.1 2008/12/18 16:44:27 bjs Exp $ + +NOTE: When updating this, make sure it harmonizes with + multimedia/ffmpeg/patches/patch-oldx264. + +--- libavcodec/libx264.c.orig 2007-10-07 15:49:37.000000000 -0400 ++++ libavcodec/libx264.c +@@ -162,7 +162,11 @@ X264_init(AVCodecContext *avctx) + + 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; +@@ -224,9 +228,10 @@ X264_init(AVCodecContext *avctx) + + 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); +@@ -251,7 +256,9 @@ X264_init(AVCodecContext *avctx) + x4->params.rc.f_ip_factor = 1/fabs(avctx->i_quant_factor); + x4->params.rc.f_pb_factor = avctx->b_quant_factor; + x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset; ++#if X264_BUILD < 61 + x4->params.rc.psz_rc_eq = avctx->rc_eq; ++#endif + + x4->params.analyse.b_psnr = (avctx->flags & CODEC_FLAG_PSNR); + x4->params.i_log_level = X264_LOG_DEBUG; -- cgit v1.2.3