X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdvdread.c;h=9575c89ef32b3222b8552943df402b0055b2f462;hb=fa4bde0b26a6c7a2a617362ea0b17144686e39fe;hp=189fab100351a40b6e559f4b8dbb3ca201063b17;hpb=d3b448c731a11c8c0b97e04d9d18ca5152a11ce3;p=vlc

diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 189fab1003..9575c89ef3 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -56,13 +56,13 @@
   #include <dvdread/ifo_read.h>
   #include <dvdread/nav_read.h>
   #include <dvdread/nav_print.h>
-#elif
+#else
   #include <libdvdread/dvd_reader.h>
   #include <libdvdread/ifo_types.h>
   #include <libdvdread/ifo_read.h>
   #include <libdvdread/nav_read.h>
   #include <libdvdread/nav_print.h>
-#else
+#endif
 
 #include <assert.h>
 
@@ -101,24 +101,24 @@ static const char *const psz_css_list_text[] = { N_("title"), N_("Disc"), N_("Ke
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-vlc_module_begin();
-    set_shortname( N_("DVD without menus") );
-    set_description( N_("DVDRead Input (DVD without menu support)") );
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_ACCESS );
+vlc_module_begin ()
+    set_shortname( N_("DVD without menus") )
+    set_description( N_("DVDRead Input (no menu support)") )
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_ACCESS )
     add_integer( "dvdread-angle", 1, NULL, ANGLE_TEXT,
-        ANGLE_LONGTEXT, false );
+        ANGLE_LONGTEXT, false )
     add_integer( "dvdread-caching", DEFAULT_PTS_DELAY / 1000, NULL,
-        CACHING_TEXT, CACHING_LONGTEXT, true );
+        CACHING_TEXT, CACHING_LONGTEXT, true )
     add_string( "dvdread-css-method", NULL, NULL, CSSMETHOD_TEXT,
-                CSSMETHOD_LONGTEXT, true );
-        change_string_list( psz_css_list, psz_css_list_text, 0 );
-    set_capability( "access_demux", 0 );
-    add_shortcut( "dvd" );
-    add_shortcut( "dvdread" );
-    add_shortcut( "dvdsimple" );
-    set_callbacks( Open, Close );
-vlc_module_end();
+                CSSMETHOD_LONGTEXT, true )
+        change_string_list( psz_css_list, psz_css_list_text, 0 )
+    set_capability( "access_demux", 0 )
+    add_shortcut( "dvd" )
+    add_shortcut( "dvdread" )
+    add_shortcut( "dvdsimple" )
+    set_callbacks( Open, Close )
+vlc_module_end ()
 
 /* how many blocks DVDRead will read in each loop */
 #define DVD_BLOCK_READ_ONCE 4
@@ -222,13 +222,15 @@ static int Open( vlc_object_t *p_this )
         psz_name[2] == '\\' && psz_name[3] == '\0' ) psz_name[2] = '\0';
 #endif
 
-    /* Override environment variable DVDCSS_METHOD with config option
-     * (FIXME: this creates a small memory leak) */
+    /* Override environment variable DVDCSS_METHOD with config option */
     psz_dvdcss_env = config_GetPsz( p_demux, "dvdread-css-method" );
     if( psz_dvdcss_env && *psz_dvdcss_env )
+#ifdef HAVE_SETENV
+        setenv( "DVDCSS_METHOD", psz_dvdcss_env, 1 );
+#else
     {
+        /* FIXME: this create a small memory leak */
         char *psz_env;
-
         psz_env = malloc( strlen("DVDCSS_METHOD=") +
                           strlen( psz_dvdcss_env ) + 1 );
         if( !psz_env )
@@ -236,11 +238,10 @@ static int Open( vlc_object_t *p_this )
             free( psz_dvdcss_env );
             return VLC_ENOMEM;
         }
-
         sprintf( psz_env, "%s%s", "DVDCSS_METHOD=", psz_dvdcss_env );
-
         putenv( psz_env );
     }
+#endif
     free( psz_dvdcss_env );
 
     /* Open dvdread */
@@ -248,7 +249,7 @@ static int Open( vlc_object_t *p_this )
     {
         msg_Err( p_demux, "DVDRead cannot open source: %s", psz_name );
         intf_UserFatal( p_demux, false, _("Playback failure"),
-                        _("DVDRead could not open the disk \"%s\"."), psz_name );
+                        _("DVDRead could not open the disc \"%s\"."), psz_name );
         free( psz_name );
         return VLC_EGENERIC;
     }
@@ -602,10 +603,15 @@ static int DemuxBlock( demux_t *p_demux, uint8_t *pkt, int i_pkt )
     demux_sys_t *p_sys = p_demux->p_sys;
     uint8_t     *p = pkt;
 
-    while( p < &pkt[i_pkt] )
+    while( p && p < &pkt[i_pkt] )
     {
-        int i_size = ps_pkt_size( p, &pkt[i_pkt] - p );
         block_t *p_pkt;
+        int i_size = &pkt[i_pkt] - p;
+
+        if( i_size < 6 )
+            break;
+ 
+        i_size = ps_pkt_size( p, i_size );
         if( i_size <= 0 )
         {
             break;
@@ -709,9 +715,15 @@ static void ESNew( demux_t *p_demux, int i_id, int i_lang )
     /* Add a new ES */
     if( tk->fmt.i_cat == VIDEO_ES )
     {
-        if( p_sys->i_aspect >= 0 )
+        switch( p_sys->i_aspect )
         {
-            tk->fmt.video.i_aspect = p_sys->i_aspect;
+        case 1: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR; break;
+        case 2: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * 4 / 3; break;
+        case 3: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * 16 / 9; break;
+        case 4: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * 221 / 10; break;
+        default:
+            tk->fmt.video.i_aspect = 0;
+            break;
         }
     }
     else if( tk->fmt.i_cat == AUDIO_ES )