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
f7bd459b
Commit
f7bd459b
authored
Jan 20, 2016
by
Petri Hintukainen
Committed by
Jean-Baptiste Kempf
Jan 20, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bluray: Accept bluray://
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
f03cb672
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
modules/access/bluray.c
modules/access/bluray.c
+10
-6
No files found.
modules/access/bluray.c
View file @
f7bd459b
...
@@ -553,10 +553,8 @@ static int blurayOpen(vlc_object_t *object)
...
@@ -553,10 +553,8 @@ static int blurayOpen(vlc_object_t *object)
if
(
probeStream
(
p_demux
)
!=
VLC_SUCCESS
)
{
if
(
probeStream
(
p_demux
)
!=
VLC_SUCCESS
)
{
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
}
else
{
}
else
if
(
!
forced
)
{
if
(
!
forced
||
!
p_demux
->
psz_file
)
{
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
}
/* */
/* */
...
@@ -593,8 +591,14 @@ static int blurayOpen(vlc_object_t *object)
...
@@ -593,8 +591,14 @@ static int blurayOpen(vlc_object_t *object)
p_sys
->
bluray
=
NULL
;
p_sys
->
bluray
=
NULL
;
}
}
}
else
{
}
else
{
/* store current bd path */
p_sys
->
psz_bd_path
=
strdup
(
p_demux
->
psz_file
);
if
(
!
p_demux
->
psz_file
)
{
/* no path provided (bluray://). use default DVD device. */
p_sys
->
psz_bd_path
=
var_InheritString
(
object
,
"dvd"
);
}
else
{
/* store current bd path */
p_sys
->
psz_bd_path
=
strdup
(
p_demux
->
psz_file
);
}
/* If we're passed a block device, try to convert it to the mount point. */
/* If we're passed a block device, try to convert it to the mount point. */
FindMountPoint
(
&
p_sys
->
psz_bd_path
);
FindMountPoint
(
&
p_sys
->
psz_bd_path
);
...
...
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