From ca05a2a27db683f0b667917a694cb3ad8af60f38 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Mon, 13 Nov 2006 15:47:05 +0000 Subject: Fix build with latest x264 Reported and tested by: Pav Forgotten by: ahze --- multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'multimedia') diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c b/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c index 7ae0189d03f4..b9b40c2c54c3 100644 --- a/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c +++ b/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c @@ -1,6 +1,17 @@ ---- 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 @@ +--- libavcodec/x264.c.orig Mon Feb 20 14:01:29 2006 ++++ libavcodec/x264.c Mon Nov 13 10:29:53 2006 +@@ -142,13 +142,17 @@ + x4->params.rc.b_stat_write = (avctx->flags & CODEC_FLAG_PASS1); + if(avctx->flags & CODEC_FLAG_PASS2) x4->params.rc.b_stat_read = 1; + else{ +- if(avctx->crf) x4->params.rc.i_rf_constant = avctx->crf; ++#if X264_BUILD >= 54 ++ if(avctx->crf) x4->params.rc.f_rf_constant = avctx->crf; ++#else ++ if(avctx->crf) x4->params.rc.i_rf_constant = avctx->crf; ++#endif + else if(avctx->cqp > -1) x4->params.rc.i_qp_constant = avctx->cqp; + } // 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 -- cgit v1.2.3