From a31d90061987fee490109a31cf0ebdd900e63cbc Mon Sep 17 00:00:00 2001 From: lioux Date: Tue, 3 Oct 2006 01:36:30 +0000 Subject: o Fix build: Rollback modification of files/patch-libavcodec_x264.c o Bump PORTREVISION (Some ARCHs build but should be rebuilt) PR: 103889 Submitted by: Hans Nieser --- multimedia/ffmpeg-devel/Makefile | 2 +- multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index 00dc31fabf18..8c1345db2f1a 100644 --- a/multimedia/ffmpeg-devel/Makefile +++ b/multimedia/ffmpeg-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= ffmpeg DISTVERSION= 0.4.9.cvs.${RELEASE_DATE} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_LOCAL} # http://mplayerhq.hu/MPlayer/cvs/ diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c b/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c index e69de29bb2d1..7ae0189d03f4 100644 --- a/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c +++ b/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c @@ -0,0 +1,11 @@ +--- libavcodec/x264.c.orig Mon Feb 20 16:01:06 2006 ++++ libavcodec/x264.c Mon Oct 2 22:26:03 2006 +@@ -148,7 +148,7 @@ + + // if neither crf nor cqp modes are selected we have to enable the RC + // we do it this way because we cannot check if the bitrate has been set +- if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.b_cbr = 1; ++ if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.i_rc_method = 1; + + x4->params.i_bframe = avctx->max_b_frames; + x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; -- cgit