Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
a0af84c5
Commit
a0af84c5
authored
May 08, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dvdnav: skip probing if forced and do not accept "file://"
parent
3ac3e139
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
modules/access/dvdnav.c
modules/access/dvdnav.c
+7
-2
No files found.
modules/access/dvdnav.c
View file @
a0af84c5
...
@@ -190,11 +190,16 @@ static int Open( vlc_object_t *p_this )
...
@@ -190,11 +190,16 @@ static int Open( vlc_object_t *p_this )
int
i_angle
;
int
i_angle
;
char
*
psz_file
;
char
*
psz_file
;
char
*
psz_code
;
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
)
if
(
!
p_demux
->
psz_file
||
!*
p_demux
->
psz_file
)
{
{
/* Only when selected */
/* Only when selected */
if
(
!
p_demux
->
psz_access
||
!*
p_demux
->
psz_access
)
if
(
!
forced
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
psz_file
=
var_InheritString
(
p_this
,
"dvd"
);
psz_file
=
var_InheritString
(
p_this
,
"dvd"
);
...
@@ -217,7 +222,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -217,7 +222,7 @@ static int Open( vlc_object_t *p_this )
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
/* Try some simple probing to avoid going through dvdnav_open too often */
/* 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
);
free
(
psz_file
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
...
...
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