Update patch-oldx264 to deal with new x264-devel snapshot. PKGREVISION++

3 files changed, 38 insertions, 7 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index ac88ad299ec..043636ae64c 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2008/12/02 19:40:43 ahoka Exp $
+# $NetBSD: Makefile,v 1.46 2008/12/18 16:31:53 bjs Exp $
 
 DISTNAME=	ffmpeg-${DISTVERSION}
 PKGNAME=	ffmpeg-${DISTVERSION:S/-//g}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_FREEBSD}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 7c77afdbffa..cb90a9d0f2e 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2008/09/15 21:24:00 sborrill Exp $
+$NetBSD: distinfo,v 1.21 2008/12/18 16:31:53 bjs Exp $
 
 SHA1 (ffmpeg-2008-07-27.tar.bz2) = 103acde7a0f02aa1c32d5dab5bf187c94441c479
 RMD160 (ffmpeg-2008-07-27.tar.bz2) = e69128fc034a3f8b0fd561f1e6ecc04dd118a977
@@ -8,6 +8,6 @@ SHA1 (patch-configure) = 747593b082f428ac1f79c6d9cad8773326351a83
 SHA1 (patch-imgconvert.c) = 3c0a9f98ddb767db6f46a02fc64451c0a79b1cbc
 SHA1 (patch-libavcodec_Makefile) = 14a31e2ea9080aa1cc3999e3fbb745018ac5e4de
 SHA1 (patch-mem.c) = b31dd3c0a53da58be34e5f6c0cbf36454649a85f
-SHA1 (patch-oldx246) = a1042c9f718ec57676cc3cb66c715c948d1782b3
+SHA1 (patch-oldx246) = 730c503422727fe4b38353f5896ce62ee6f12ebe
 SHA1 (patch-r14477) = fb68f691fe68b6dc4ddd31c4c366d0dae11ab999
 SHA1 (patch-v4l2) = ed35dbd2d08337239f051c74c414e01609fb6ef6
diff --git a/multimedia/ffmpeg/patches/patch-oldx246 b/multimedia/ffmpeg/patches/patch-oldx246
index cde6e191f1b..64d16d42c62 100644
--- a/multimedia/ffmpeg/patches/patch-oldx246
+++ b/multimedia/ffmpeg/patches/patch-oldx246
@@ -1,8 +1,20 @@
-$NetBSD: patch-oldx246,v 1.1 2008/09/12 14:19:33 ahoka Exp $
+$NetBSD: patch-oldx246,v 1.2 2008/12/18 16:31:53 bjs Exp $
 
---- libavcodec/libx264.c.orig	2008-06-12 23:50:13.000000000 +0200
+--- libavcodec/libx264.c.orig	2008-12-09 04:46:35.000000000 -0500
 +++ libavcodec/libx264.c
-@@ -220,8 +220,10 @@ X264_init(AVCodecContext *avctx)
+@@ -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;
@@ -13,3 +25,22 @@ $NetBSD: patch-oldx246,v 1.1 2008/09/12 14:19:33 ahoka Exp $
      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;