OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x264 bump to r1339-82b80ef
[handbrake-jp/handbrake-jp-git.git]
/
libhb
/
encx264.c
diff --git
a/libhb/encx264.c
b/libhb/encx264.c
index
efccf7c
..
bd41839
100644
(file)
--- a/
libhb/encx264.c
+++ b/
libhb/encx264.c
@@
-86,7
+86,7
@@
int encx264Init( hb_work_object_t * w, hb_job_t * job )
x264_param_default( ¶m );
x264_param_default( ¶m );
- /*
Temporarily default mbtree
to off for baseline,
+ /*
Default weightp
to off for baseline,
overridable through x264 option strings. */
if( job->x264opts != NULL && *job->x264opts != '\0' )
{
overridable through x264 option strings. */
if( job->x264opts != NULL && *job->x264opts != '\0' )
{
@@
-124,7
+124,7
@@
int encx264Init( hb_work_object_t * w, hb_job_t * job )
{
if( atoi( value ) == 0 )
{
{
if( atoi( value ) == 0 )
{
- param.
rc.b_mb_tree = 0
;
+ param.
analyse.i_weighted_pred = X264_WEIGHTP_NONE
;
}
}
}
}
}
}
@@
-255,6
+255,14
@@
int encx264Init( hb_work_object_t * w, hb_job_t * job )
{
job->areBframes = 2;
}
{
job->areBframes = 2;
}
+ if( value == NULL || !strcmp( value, "1" ) )
+ {
+ value = "normal";
+ }
+ else if( !strcmp( value, "0" ) )
+ {
+ value = "none";
+ }
}
/* Here's where the strings are passed to libx264 for parsing. */
}
/* Here's where the strings are passed to libx264 for parsing. */