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
6bfd731b
Commit
6bfd731b
authored
Aug 12, 2013
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bluray: blurayInitTitles can not fail
parent
7a558439
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
6 deletions
+3
-6
modules/access/bluray.c
modules/access/bluray.c
+3
-6
No files found.
modules/access/bluray.c
View file @
6bfd731b
...
...
@@ -156,7 +156,7 @@ static es_out_t *esOutNew( demux_t *p_demux );
static
int
blurayControl
(
demux_t
*
,
int
,
va_list
);
static
int
blurayDemux
(
demux_t
*
);
static
int
blurayInitTitles
(
demux_t
*
p_demux
);
static
void
blurayInitTitles
(
demux_t
*
p_demux
);
static
int
bluraySetTitle
(
demux_t
*
p_demux
,
int
i_title
);
static
void
blurayOverlayProc
(
void
*
ptr
,
const
BD_OVERLAY
*
const
overlay
);
...
...
@@ -342,9 +342,7 @@ static int blurayOpen( vlc_object_t *object )
if
(
!
p_sys
->
p_meta
)
msg_Warn
(
p_demux
,
"Failed to get meta info."
);
if
(
blurayInitTitles
(
p_demux
)
!=
VLC_SUCCESS
)
{
goto
error
;
}
blurayInitTitles
(
p_demux
);
/*
* Initialize the event queue, so we can receive events in blurayDemux(Menu).
...
...
@@ -1030,7 +1028,7 @@ static void bluraySendOverlayToVout(demux_t *p_demux)
p_sys
->
p_overlays
[
p_sys
->
current_overlay
]
->
status
=
Outdated
;
}
static
int
blurayInitTitles
(
demux_t
*
p_demux
)
static
void
blurayInitTitles
(
demux_t
*
p_demux
)
{
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
...
...
@@ -1064,7 +1062,6 @@ static int blurayInitTitles(demux_t *p_demux )
TAB_APPEND
(
p_sys
->
i_title
,
p_sys
->
pp_title
,
t
);
bd_free_title_info
(
title_info
);
}
return
VLC_SUCCESS
;
}
static
void
blurayResetParser
(
demux_t
*
p_demux
)
...
...
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