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
e2409ee4
Commit
e2409ee4
authored
Jan 20, 2016
by
Jean-Baptiste Kempf
Committed by
Thomas Guillem
Jan 20, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bluray: fix compatibility with older libbluray version
Signed-off-by:
Thomas Guillem
<
thomas@gllm.fr
>
parent
179f76d0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
2 deletions
+12
-2
modules/access/bluray.c
modules/access/bluray.c
+12
-2
No files found.
modules/access/bluray.c
View file @
e2409ee4
...
...
@@ -81,6 +81,10 @@ static const char *const ppsz_region_code_text[] = {
#define REGION_DEFAULT 1
/* Index to region list. Actual region code is (1<<REGION_DEFAULT) */
#define LANGUAGE_DEFAULT ("eng")
#if BLURAY_VERSION >= BLURAY_VERSION_CODE(0,8,0)
# define BLURAY_DEMUX
#endif
/* Callbacks */
static
int
blurayOpen
(
vlc_object_t
*
);
static
void
blurayClose
(
vlc_object_t
*
);
...
...
@@ -100,6 +104,7 @@ vlc_module_begin ()
set_callbacks
(
blurayOpen
,
blurayClose
)
#ifdef BLURAY_DEMUX
/* demux module */
add_submodule
()
set_description
(
"BluRay demuxer"
)
...
...
@@ -107,6 +112,7 @@ vlc_module_begin ()
set_subcategory
(
SUBCAT_INPUT_DEMUX
)
set_capability
(
"demux"
,
5
)
set_callbacks
(
blurayOpen
,
blurayClose
)
#endif
vlc_module_end
()
...
...
@@ -503,6 +509,7 @@ static int probeStream(demux_t *p_demux)
return
VLC_SUCCESS
;
}
#ifdef BLURAY_DEMUX
static
int
blurayReadBlock
(
void
*
object
,
void
*
buf
,
int
lba
,
int
num_blocks
)
{
demux_t
*
p_demux
=
(
demux_t
*
)
object
;
...
...
@@ -531,6 +538,7 @@ static int blurayReadBlock(void *object, void *buf, int lba, int num_blocks)
return
result
;
}
#endif
/*****************************************************************************
* probing of local files
...
...
@@ -664,6 +672,7 @@ static int blurayOpen(vlc_object_t *object)
var_AddCallback
(
p_demux
->
p_input
,
"intf-event"
,
onIntfEvent
,
p_demux
);
/* Open BluRay */
#ifdef BLURAY_DEMUX
if
(
p_demux
->
s
)
{
i_init_pos
=
stream_Tell
(
p_demux
->
s
);
...
...
@@ -672,8 +681,9 @@ static int blurayOpen(vlc_object_t *object)
bd_close
(
p_sys
->
bluray
);
p_sys
->
bluray
=
NULL
;
}
}
else
{
}
else
#endif
{
if
(
!
p_demux
->
psz_file
)
{
/* no path provided (bluray://). use default DVD device. */
p_sys
->
psz_bd_path
=
var_InheritString
(
object
,
"dvd"
);
...
...
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