# HG changeset patch
# User lu_zero
# Date 1161020669 0
# Node ID ffe1b004ecc7b5672f3c5797a038475f8302919f
# Parent  5160e1bdeff2b8b384c6ae0d42e5a14f5eb5f296
Make ffmpeg work with x264 r592

diff -r 5160e1bdeff2 -r ffe1b004ecc7 avcodec.h
--- a/avcodec.h	Mon Oct 16 15:01:12 2006 +0000
+++ b/avcodec.h	Mon Oct 16 17:44:29 2006 +0000
@@ -1889,7 +1889,7 @@
      * - encoding: set by user.
      * - decoding: unused
      */
-    int crf;
+    float crf;
 
     /**
      * constant quantization parameter rate control method
diff -r 5160e1bdeff2 -r ffe1b004ecc7 utils.c
--- a/utils.c	Mon Oct 16 15:01:12 2006 +0000
+++ b/utils.c	Mon Oct 16 17:44:29 2006 +0000
@@ -684,7 +684,7 @@
 {"mepc", "motion estimation bitrate penalty compensation (1.0 = 256)", OFFSET(me_penalty_compensation), FF_OPT_TYPE_INT, 256, INT_MIN, INT_MAX, V|E},
 {"bidir_refine", NULL, OFFSET(bidir_refine), FF_OPT_TYPE_INT, DEFAULT, 0, 4, V|E},
 {"brd_scale", NULL, OFFSET(brd_scale), FF_OPT_TYPE_INT, DEFAULT, 0, 10, V|E},
-{"crf", NULL, OFFSET(crf), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
+{"crf", NULL, OFFSET(crf), FF_OPT_TYPE_FLOAT, DEFAULT, 0, 51, V|E},
 {"cqp", NULL, OFFSET(cqp), FF_OPT_TYPE_INT, -1, INT_MIN, INT_MAX, V|E},
 {"keyint_min", NULL, OFFSET(keyint_min), FF_OPT_TYPE_INT, 25, INT_MIN, INT_MAX, V|E},
 {"refs", NULL, OFFSET(refs), FF_OPT_TYPE_INT, 1, INT_MIN, INT_MAX, V|E},
diff -r 5160e1bdeff2 -r ffe1b004ecc7 x264.c
--- a/x264.c	Mon Oct 16 15:01:12 2006 +0000
+++ b/x264.c	Mon Oct 16 17:44:29 2006 +0000
@@ -146,7 +146,7 @@
     else{
         if(avctx->crf){
             x4->params.rc.i_rc_method = X264_RC_CRF;
-            x4->params.rc.i_rf_constant = avctx->crf;
+            x4->params.rc.f_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;