Commit f2287d10 authored by Rémi Duraffort's avatar Rémi Duraffort

libvlc: fix logic '||' and not '&&'.

parent b25b2e0c
...@@ -454,7 +454,7 @@ void libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_track, ...@@ -454,7 +454,7 @@ void libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_track,
return; return;
var_Change( p_input_thread, "audio-es", VLC_VAR_GETCHOICES, &val_list, NULL ); var_Change( p_input_thread, "audio-es", VLC_VAR_GETCHOICES, &val_list, NULL );
if( (i_track < 0) && (i_track > val_list.p_list->i_count) ) if( (i_track < 0) || (i_track > val_list.p_list->i_count) )
{ {
libvlc_exception_raise( p_e, "Audio track out of range" ); libvlc_exception_raise( p_e, "Audio track out of range" );
goto end; goto end;
...@@ -509,5 +509,4 @@ void libvlc_audio_set_channel( libvlc_instance_t *p_instance, ...@@ -509,5 +509,4 @@ void libvlc_audio_set_channel( libvlc_instance_t *p_instance,
vlc_object_release( p_aout ); vlc_object_release( p_aout );
} }
} }
...@@ -320,7 +320,7 @@ void libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu, ...@@ -320,7 +320,7 @@ void libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu,
goto end; goto end;
} }
if( (i_spu < 0) && (i_spu > val_list.p_list->i_count) ) if( (i_spu < 0) || (i_spu > val_list.p_list->i_count) )
{ {
libvlc_exception_raise( p_e, "Subtitle value out of range" ); libvlc_exception_raise( p_e, "Subtitle value out of range" );
goto end; goto end;
...@@ -699,7 +699,7 @@ int libvlc_video_get_marquee_option_as_int( libvlc_media_player_t *p_mi, ...@@ -699,7 +699,7 @@ int libvlc_video_get_marquee_option_as_int( libvlc_media_player_t *p_mi,
vlc_object_release(marquee); vlc_object_release(marquee);
return isEnabled; return isEnabled;
} }
/* Generic case */ /* Generic case */
if(!identifier) if(!identifier)
{ {
...@@ -724,7 +724,7 @@ char * libvlc_video_get_marquee_option_as_string( libvlc_media_player_t *p_mi, ...@@ -724,7 +724,7 @@ char * libvlc_video_get_marquee_option_as_string( libvlc_media_player_t *p_mi,
libvlc_exception_raise( p_e, "This option is not available" ); libvlc_exception_raise( p_e, "This option is not available" );
return 0; return 0;
} }
vlc_object_t * marquee = get_marquee_object(p_mi); vlc_object_t * marquee = get_marquee_object(p_mi);
if(!marquee) if(!marquee)
{ {
......
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