Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
a0af84c5
Commit
a0af84c5
authored
May 08, 2011
by
Rémi Denis-Courmont
Browse files
dvdnav: skip probing if forced and do not accept "file://"
parent
3ac3e139
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/access/dvdnav.c
View file @
a0af84c5
...
...
@@ -190,11 +190,16 @@ static int Open( vlc_object_t *p_this )
int
i_angle
;
char
*
psz_file
;
char
*
psz_code
;
bool
forced
=
false
;
if
(
p_demux
->
psz_access
!=
NULL
&&
!
strncmp
(
p_demux
->
psz_access
,
"dvd"
,
3
)
)
forced
=
true
;
if
(
!
p_demux
->
psz_file
||
!*
p_demux
->
psz_file
)
{
/* Only when selected */
if
(
!
p_demux
->
psz_access
||
!*
p_demux
->
psz_access
)
if
(
!
forced
)
return
VLC_EGENERIC
;
psz_file
=
var_InheritString
(
p_this
,
"dvd"
);
...
...
@@ -217,7 +222,7 @@ static int Open( vlc_object_t *p_this )
return
VLC_EGENERIC
;
/* Try some simple probing to avoid going through dvdnav_open too often */
if
(
ProbeDVD
(
psz_file
)
!=
VLC_SUCCESS
)
if
(
!
forced
&&
ProbeDVD
(
psz_file
)
!=
VLC_SUCCESS
)
{
free
(
psz_file
);
return
VLC_EGENERIC
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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