Dark Shikari
27th February 2009, 00:12
What you need to know:
diff --git a/x264.c b/x264.c
index da79e96..9aafc35 100644
--- a/x264.c
+++ b/x264.c
@@ -165,9 +165,8 @@ static void Help( x264_param_t *defaults, int b_longhelp )
H0( "\n" );
H0( " -I, --keyint <integer> Maximum GOP size [%d]\n", defaults->i_keyint_max );
H1( " -i, --min-keyint <integer> Minimum GOP size [%d]\n", defaults->i_keyint_min );
+ H1( " --no-scenecut Disable adaptive I-frame decision\n" );
H1( " --scenecut <integer> How aggressively to insert extra I-frames [%d]\n", defaults->i_scenecut_threshold );
- H1( " --pre-scenecut Faster, less precise scenecut detection.\n"
- " Required and implied by multi-threading.\n" );
H0( " -b, --bframes <integer> Number of B-frames between I and P [%d]\n", defaults->i_bframe );
H1( " --b-adapt Adaptive B-frame decision method [%d]\n"
" Higher values may lower threading efficiency.\n"
@@ -397,7 +396,7 @@ static int Parse( int argc, char **argv,
{ "min-keyint",required_argument,NULL,'i' },
{ "keyint", required_argument, NULL, 'I' },
{ "scenecut",required_argument, NULL, 0 },
- { "pre-scenecut", no_argument, NULL, 0 },
+ { "no-scenecut",no_argument, NULL, 0 },
{ "nf", no_argument, NULL, 0 },
{ "no-deblock", no_argument, NULL, 0 },
{ "filter", required_argument, NULL, 0 },
diff --git a/x264.h b/x264.h
index 820185f..3971992 100644
--- a/x264.h
+++ b/x264.h
@@ -35,7 +35,7 @@
#include <stdarg.h>
-#define X264_BUILD 66
+#define X264_BUILD 67
/* x264_t:
* opaque handler for encoder */
@@ -188,7 +188,6 @@ typedef struct x264_param_t
int i_keyint_max; /* Force an IDR keyframe at this interval */
int i_keyint_min; /* Scenecuts closer together than this are coded as I, not IDR. */
int i_scenecut_threshold; /* how aggressively to insert extra I frames */
- int b_pre_scenecut; /* compute scenecut on lowres frames */
int i_bframe; /* how many b-frame between 2 references pictures */
int i_bframe_adaptive;
int i_bframe_bias;
Non-pre scenecut is going away. Adjust your GUIs/frontends accordingly.
(And --scenecut 0 will now disable scenecut, as will --no-scenecut.)
diff --git a/x264.c b/x264.c
index da79e96..9aafc35 100644
--- a/x264.c
+++ b/x264.c
@@ -165,9 +165,8 @@ static void Help( x264_param_t *defaults, int b_longhelp )
H0( "\n" );
H0( " -I, --keyint <integer> Maximum GOP size [%d]\n", defaults->i_keyint_max );
H1( " -i, --min-keyint <integer> Minimum GOP size [%d]\n", defaults->i_keyint_min );
+ H1( " --no-scenecut Disable adaptive I-frame decision\n" );
H1( " --scenecut <integer> How aggressively to insert extra I-frames [%d]\n", defaults->i_scenecut_threshold );
- H1( " --pre-scenecut Faster, less precise scenecut detection.\n"
- " Required and implied by multi-threading.\n" );
H0( " -b, --bframes <integer> Number of B-frames between I and P [%d]\n", defaults->i_bframe );
H1( " --b-adapt Adaptive B-frame decision method [%d]\n"
" Higher values may lower threading efficiency.\n"
@@ -397,7 +396,7 @@ static int Parse( int argc, char **argv,
{ "min-keyint",required_argument,NULL,'i' },
{ "keyint", required_argument, NULL, 'I' },
{ "scenecut",required_argument, NULL, 0 },
- { "pre-scenecut", no_argument, NULL, 0 },
+ { "no-scenecut",no_argument, NULL, 0 },
{ "nf", no_argument, NULL, 0 },
{ "no-deblock", no_argument, NULL, 0 },
{ "filter", required_argument, NULL, 0 },
diff --git a/x264.h b/x264.h
index 820185f..3971992 100644
--- a/x264.h
+++ b/x264.h
@@ -35,7 +35,7 @@
#include <stdarg.h>
-#define X264_BUILD 66
+#define X264_BUILD 67
/* x264_t:
* opaque handler for encoder */
@@ -188,7 +188,6 @@ typedef struct x264_param_t
int i_keyint_max; /* Force an IDR keyframe at this interval */
int i_keyint_min; /* Scenecuts closer together than this are coded as I, not IDR. */
int i_scenecut_threshold; /* how aggressively to insert extra I frames */
- int b_pre_scenecut; /* compute scenecut on lowres frames */
int i_bframe; /* how many b-frame between 2 references pictures */
int i_bframe_adaptive;
int i_bframe_bias;
Non-pre scenecut is going away. Adjust your GUIs/frontends accordingly.
(And --scenecut 0 will now disable scenecut, as will --no-scenecut.)