Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
f2287d10
Commit
f2287d10
authored
Aug 28, 2009
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libvlc: fix logic '||' and not '&&'.
parent
b25b2e0c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
src/control/audio.c
src/control/audio.c
+1
-2
src/control/video.c
src/control/video.c
+3
-3
No files found.
src/control/audio.c
View file @
f2287d10
...
...
@@ -454,7 +454,7 @@ void libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_track,
return
;
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"
);
goto
end
;
...
...
@@ -509,5 +509,4 @@ void libvlc_audio_set_channel( libvlc_instance_t *p_instance,
vlc_object_release
(
p_aout
);
}
}
src/control/video.c
View file @
f2287d10
...
...
@@ -320,7 +320,7 @@ void libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu,
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"
);
goto
end
;
...
...
@@ -699,7 +699,7 @@ int libvlc_video_get_marquee_option_as_int( libvlc_media_player_t *p_mi,
vlc_object_release
(
marquee
);
return
isEnabled
;
}
/* Generic case */
if
(
!
identifier
)
{
...
...
@@ -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"
);
return
0
;
}
vlc_object_t
*
marquee
=
get_marquee_object
(
p_mi
);
if
(
!
marquee
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment