fixup merge commit-id 727cb1a4

Conflicts:
	include/vlc_stream.h
	modules/codec/x264.c

include/vlc_stream.h

@@ -59,7 +59,6 @@ struct stream_t
 
     char        *psz_access;
     /* Real or virtual path (it can only be changed during stream_t opening) */
-    char        *psz_access;
     char        *psz_path;
 
     /* Stream source for stream filter */

modules/codec/x264.c

@@ -425,7 +425,7 @@ vlc_module_begin ()
 
 #if X264_BUILD >= 102
     add_string( SOUT_CFG_PREFIX "opengop", "none", OPENGOP_TEXT,
-               OPENGOP_LONGTEXT,false )
+               OPENGOP_LONGTEXT, false )
         change_string_list( x264_open_gop_names, x264_open_gop_names, 0 );
 #endif
 
@@ -478,7 +478,7 @@ vlc_module_begin ()
                LEVEL_LONGTEXT, false )
 
 #if X264_BUILD >= 86
-    add_string( SOUT_CFG_PREFIX "profile", "high", NULL, PROFILE_TEXT,
+    add_string( SOUT_CFG_PREFIX "profile", "high", PROFILE_TEXT,
                PROFILE_LONGTEXT, false )
         change_string_list( x264_profile_names, x264_profile_names, 0 );
 #endif
@@ -678,7 +678,7 @@ vlc_module_begin ()
                 STATS_LONGTEXT, false )
 
 #if X264_BUILD >= 86
-    add_string( SOUT_CFG_PREFIX "preset", NULL , NULL, PRESET_TEXT , PRESET_TEXT, false )
+    add_string( SOUT_CFG_PREFIX "preset", NULL, PRESET_TEXT , PRESET_TEXT, false )
         change_string_list( x264_preset_names, x264_preset_names, 0 );
     add_string( SOUT_CFG_PREFIX "tune", NULL , TUNE_TEXT, TUNE_TEXT, false )
         change_string_list( x264_tune_names, x264_tune_names, 0 );