Skip to content

V
vlc
Commit 19e9a808 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

  * Backported a VCD crash fix from the main branch.
parent 7b888695
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
plugins/vcd/Makefile
View file @ 19e9a808
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# Objects # 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) BUILTIN_VCD = $(PLUGIN_VCD:%.o=BUILTIN_%.o)
ALL_OBJ = $(PLUGIN_VCD) $(BUILTIN_VCD) ALL_OBJ = $(PLUGIN_VCD) $(BUILTIN_VCD)
......
plugins/vcd/input_vcd.c
View file @ 19e9a808
...@@ -615,7 +615,7 @@ static int VCDRead( input_thread_t * p_input, ...@@ -615,7 +615,7 @@ static int VCDRead( input_thread_t * p_input,
break; break;
} }
pp_packets[i_packet] = NULL;
vlc_mutex_lock( &p_input->stream.stream_lock ); vlc_mutex_lock( &p_input->stream.stream_lock );
...@@ -632,8 +632,8 @@ static int VCDRead( input_thread_t * p_input, ...@@ -632,8 +632,8 @@ static int VCDRead( input_thread_t * p_input,
}*/ }*/
b_eof = p_vcd->b_end_of_track; b_eof = p_vcd->b_end_of_track
/*FIXME&& ( ( p_vcd->current_track ) >= p_vcd->nb_tracks - 1);*/ && ( ( p_vcd->current_track ) >= p_vcd->nb_tracks - 1);
if( b_eof ) if( b_eof )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment