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


1.3
date	2010.09.16.18.56.12;	author wiz;	state dead;
branches;
next	1.2;

1.2
date	2009.10.18.22.22.10;	author ahoka;	state Exp;
branches;
next	1.1;

1.1
date	2008.12.18.16.44.27;	author bjs;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Update to 20100913, provided by Aleksey Cheusov via wip.

One year of changes.
Ok ahoka@@
@
text
@$NetBSD: patch-ao,v 1.2 2009/10/18 22:22:10 ahoka Exp $

NOTE:	When updating this, make sure it harmonizes with
	multimedia/ffmpeg/patches/patch-oldx264.

--- libavcodec/libx264.c.orig	2009-09-29 20:03:30.000000000 +0200
+++ libavcodec/libx264.c
@@@@ -179,7 +179,11 @@@@ static av_cold int X264_init(AVCodecCont
 
     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;
@@@@ -244,6 +248,10 @@@@ static av_cold int X264_init(AVCodecCont
     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;
     x4->params.analyse.b_transform_8x8    = avctx->flags2 & CODEC_FLAG2_8X8DCT;
@@@@ -269,6 +277,10 @@@@ static av_cold int X264_init(AVCodecCont
     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
@Upgrade to the SVN snapshot as of 2009-10-17.
The builtin libavcodec now uses yasm to assemble hand written
h264 code. The older x264 we currently have in pkgsrc is not supported
by mplayer, so I had to do some hand tweaking to make it work.
It may contain bugs because of this, so report any fallouts with h264.
@
text
@d1 1
a1 1
$NetBSD: patch-ao,v 1.1 2008/12/18 16:44:27 bjs Exp $
@


1.1
log
@Add patch for new x264.
@
text
@d1 1
a1 1
$NetBSD$
d6 1
a6 1
--- libavcodec/libx264.c.orig	2007-10-07 15:49:37.000000000 -0400
d8 1
a8 1
@@@@ -162,7 +162,11 @@@@ X264_init(AVCodecContext *avctx)
d10 2
a11 2
     x4->params.i_bframe = avctx->max_b_frames;
     x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
d13 1
a13 1
+    x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
d15 1
a15 1
     x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
d17 6
a22 4
     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)
a23 3
     x4->params.analyse.i_me_range = avctx->me_range;
     x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
-
d25 2
a26 2
     x4->params.analyse.b_bidir_me = (avctx->bidir_refine > 0);
     x4->params.analyse.b_bframe_rdo = (avctx->flags2 & CODEC_FLAG2_BRDO);
d28 5
a32 6
     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;
d34 1
d36 1
a36 1
     x4->params.rc.psz_rc_eq = avctx->rc_eq;
d38 3
a41 2
     x4->params.analyse.b_psnr = (avctx->flags & CODEC_FLAG_PSNR);
     x4->params.i_log_level = X264_LOG_DEBUG;
@