vcdplayer.c: fix gcc 4-caught uninitialized variable.

vcd.c: more logical order of macros (I think)

diff --git a/modules/access/vcdx/vcd.c b/modules/access/vcdx/vcd.c
index 50fe8ebf27233f4823c049a609076c26a8f30952..fd3fc53b72bc12fd871b949f6d2ae53405429642 100644 (file)
--- a/modules/access/vcdx/vcd.c
+++ b/modules/access/vcdx/vcd.c
@@ -92,14 +92,14 @@ int  E_(BlocksPerReadCallback) ( vlc_object_t *p_this, const char *psz_name,
  *****************************************************************************/
 
 vlc_module_begin();
-    add_usage_hint( N_("vcdx://[device-or-file][@{P,S,T}num]") );
-    set_description( _("Video CD (VCD 1.0, 1.1, 2.0, SVCD, HQVCD) input") );
-    set_capability( "access2", 55 /* slightly lower than vcd */ );
     set_shortname( N_("(Super) Video CD"));
-    set_callbacks( VCDOpen, VCDClose );
+    set_description( _("Video CD (VCD 1.0, 1.1, 2.0, SVCD, HQVCD) input") );
+    add_usage_hint( N_("vcdx://[device-or-file][@{P,S,T}num]") );
     add_shortcut( "vcdx" );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
+    set_capability( "access2", 55 /* slightly lower than vcd */ );
+    set_callbacks( VCDOpen, VCDClose );
 
     /* Configuration options */
     add_integer ( MODULE_STRING "-debug", 0, NULL,

diff --git a/modules/access/vcdx/vcdplayer.c b/modules/access/vcdx/vcdplayer.c
index fbeddad66abdf3d33e3668669c4dcdaac342b202..7524581030845427715e106088b34d0c2e026c77 100644 (file)
--- a/modules/access/vcdx/vcdplayer.c
+++ b/modules/access/vcdx/vcdplayer.c
@@ -695,6 +695,7 @@ vcdplayer_play_default( access_t * p_access )
       dbg_print(INPUT_DBG_PBC, "DEFAULT to %d", itemid.num);
     } else {
       dbg_print(INPUT_DBG_PBC, "no DEFAULT for LID %d", p_vcdplayer->i_lid);
+      return VLC_EGENERIC;
     }
 
 #else 
@@ -724,7 +725,7 @@ vcdplayer_play_default( access_t * p_access )
     /* PBC is not on. "default" selection beginning of current 
        selection . */
   
-    p_vcdplayer->play_item.num = p_vcdplayer->play_item.num;
+    itemid.num = p_vcdplayer->play_item.num;
     
   }