SOURCES: ffmpeg-x264.patch (NEW) - fixes build with libx264 200608...

grzegol grzegol at pld-linux.org
Mon Sep 11 23:22:01 CEST 2006


Author: grzegol                      Date: Mon Sep 11 21:22:01 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixes build with libx264 20060828 snapshot

---- Files affected:
SOURCES:
   ffmpeg-x264.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/ffmpeg-x264.patch
diff -u /dev/null SOURCES/ffmpeg-x264.patch:1.1
--- /dev/null	Mon Sep 11 23:22:01 2006
+++ SOURCES/ffmpeg-x264.patch	Mon Sep 11 23:21:55 2006
@@ -0,0 +1,24 @@
+--- trunk/libavcodec/x264.c	2006/02/20 19:01:29	5040
++++ trunk/libavcodec/x264.c	2006/07/18 01:29:43	5780
+@@ -142,13 +142,18 @@
+     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;
+-        else if(avctx->cqp > -1) x4->params.rc.i_qp_constant = avctx->cqp;
++        if(avctx->crf){
++            x4->params.rc.i_rc_method = X264_RC_CRF;
++            x4->params.rc.i_rf_constant = avctx->crf;
++        }else if(avctx->cqp > -1){
++            x4->params.rc.i_rc_method = X264_RC_CQP;
++            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
+-    if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.b_cbr = 1;
++    if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.i_rc_method = X264_RC_ABR;
+ 
+     x4->params.i_bframe = avctx->max_b_frames;
+     x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
================================================================


More information about the pld-cvs-commit mailing list