head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.10
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.8
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.6
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.4
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.2
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2009Q1:1.2.0.4
	pkgsrc-2009Q1-base:1.2
	pkgsrc-2008Q4:1.2.0.2
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.1.0.4
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.2
	cube-native-xorg-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2009.06.12.16.25.34;	author ahoka;	state dead;
branches;
next	1.2;

1.2
date	2008.12.18.16.31.53;	author bjs;	state Exp;
branches;
next	1.1;

1.1
date	2008.09.12.14.19.33;	author ahoka;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Update to nightly the snapshot as of 2009-06-11.
Also modularize a bit, so we can have a separate ffplay package.

Too many changes to list them.
@
text
@$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;
@


1.2
log
@Update patch-oldx264 to deal with new x264-devel snapshot.  PKGREVISION++
@
text
@d1 1
a1 1
$NetBSD: patch-oldx246,v 1.1 2008/09/12 14:19:33 ahoka Exp $
@


1.1
log
@I should have added this file in my previous commit.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- libavcodec/libx264.c.orig	2008-06-12 23:50:13.000000000 +0200
d5 13
a17 1
@@@@ -220,8 +220,10 @@@@ X264_init(AVCodecContext *avctx)
d28 19
@