]> git.sesse.net Git - vlc/commitdiff
x264: don't set default level to 5.1, but let libx264 pick level by default.
authorIlkka Ollakka <ileoo@videolan.org>
Tue, 30 Mar 2010 14:27:32 +0000 (17:27 +0300)
committerIlkka Ollakka <ileoo@videolan.org>
Thu, 1 Apr 2010 11:29:13 +0000 (14:29 +0300)
modules/codec/x264.c

index ec79daee6dddfad19f0942676e2551b6722897ee..4606ab254dedb44eb8379683fabe98bca56cb9a5 100644 (file)
@@ -466,7 +466,7 @@ vlc_module_begin ()
 
     add_bool( SOUT_CFG_PREFIX "psy", true, NULL, PSY_TEXT, PSY_LONGTEXT, false )
 
-    add_string( SOUT_CFG_PREFIX "level", "5.1", NULL, LEVEL_TEXT,
+    add_string( SOUT_CFG_PREFIX "level", "0", NULL, LEVEL_TEXT,
                LEVEL_LONGTEXT, false )
 
     add_string( SOUT_CFG_PREFIX "profile", "high", NULL, PROFILE_TEXT,
@@ -841,10 +841,10 @@ static int  Open ( vlc_object_t *p_this )
     psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "level" );
     if( psz_val )
     {
-        if( us_atof (psz_val) < 6 )
+        if( us_atof (psz_val) < 6 && us_atof (psz_val) > 0 )
             p_sys->param.i_level_idc = (int) (10 * us_atof (psz_val)
                                               + .5);
-        else
+        else if( atoi(psz_val) > 0 )
             p_sys->param.i_level_idc = atoi (psz_val);
         free( psz_val );
     }