diff options
Diffstat (limited to 'multimedia/ffmpeg/patches/patch-oldx246')
-rw-r--r-- | multimedia/ffmpeg/patches/patch-oldx246 | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/multimedia/ffmpeg/patches/patch-oldx246 b/multimedia/ffmpeg/patches/patch-oldx246 deleted file mode 100644 index 64d16d42c62..00000000000 --- a/multimedia/ffmpeg/patches/patch-oldx246 +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-oldx246,v 1.2 2008/12/18 16:31:53 bjs Exp $ - ---- libavcodec/libx264.c.orig 2008-12-09 04:46:35.000000000 -0500 -+++ 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; -@@ -220,15 +224,18 @@ X264_init(AVCodecContext *avctx) - x4->params.analyse.i_me_method = X264_ME_UMH; - else if(avctx->me_method == ME_FULL) - x4->params.analyse.i_me_method = X264_ME_ESA; -+#ifdef HAVE_X264_TESA - else if(avctx->me_method == ME_TESA) - x4->params.analyse.i_me_method = X264_ME_TESA; -+#endif - else x4->params.analyse.i_me_method = X264_ME_HEX; - - 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; -@@ -253,7 +260,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; |