* Backported a VCD crash fix from the main branch.

diff --git a/plugins/vcd/Makefile b/plugins/vcd/Makefile
index 25c89ca20e64326bbd96168feeb3057cd63a7fdf..bc35d8397026b6df4f1a54c31ab45258eb332594 100644 (file)
--- a/plugins/vcd/Makefile
+++ b/plugins/vcd/Makefile
@@ -7,7 +7,7 @@
 # Objects
 #
 
-PLUGIN_VCD = vcd.o input_vcd.o linux_cdrom_tools.o $(OBJ_VCD)
+PLUGIN_VCD = vcd.o input_vcd.o linux_cdrom_tools.o
 BUILTIN_VCD = $(PLUGIN_VCD:%.o=BUILTIN_%.o)
 
 ALL_OBJ = $(PLUGIN_VCD) $(BUILTIN_VCD)

diff --git a/plugins/vcd/input_vcd.c b/plugins/vcd/input_vcd.c
index 09b81545ff1e9e620988c06464f511a456e7d0f6..2443b8e2a12003e7a1b2bf341d233cd1cdf61914 100644 (file)
--- a/plugins/vcd/input_vcd.c
+++ b/plugins/vcd/input_vcd.c
@@ -615,7 +615,7 @@ static int VCDRead( input_thread_t * p_input,
             break;
     }
 
-
+    pp_packets[i_packet] = NULL;
     
     vlc_mutex_lock( &p_input->stream.stream_lock );
 
@@ -632,8 +632,8 @@ static int VCDRead( input_thread_t * p_input,
     }*/
 
     
-    b_eof = p_vcd->b_end_of_track; 
-        /*FIXME&& ( ( p_vcd->current_track ) >= p_vcd->nb_tracks - 1);*/
+    b_eof = p_vcd->b_end_of_track
+               && ( ( p_vcd->current_track ) >= p_vcd->nb_tracks - 1);
 
     if( b_eof )
     {