Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
82957718
Commit
82957718
authored
May 07, 2004
by
Rocky Bernstein
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tolerate compilation with vcdimager 0.7.20. Sigh.
parent
99f8e80f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
1 deletion
+23
-1
configure.ac
configure.ac
+1
-1
modules/access/vcdx/vcdplayer.c
modules/access/vcdx/vcdplayer.c
+22
-0
No files found.
configure.ac
View file @
82957718
...
...
@@ -1593,7 +1593,7 @@ then
if test "${enable_vcdx}" != "no"
then
PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.2
1
,
PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.2
0
,
[enable_vcd="no"
AC_DEFINE(HAVE_VCDX, [],
[Define for the VCD plugin using libcdio/libvcdinfo])
...
...
modules/access/vcdx/vcdplayer.c
View file @
82957718
...
...
@@ -321,6 +321,7 @@ vcdplayer_play_default( input_thread_t * p_input )
if
(
vcdplayer_pbc_is_on
(
p_vcd
))
{
#if defined(LIBVCD_VERSION)
lid_t
lid
=
vcdinfo_get_multi_default_lid
(
p_vcd
->
vcd
,
p_vcd
->
cur_lid
,
p_vcd
->
cur_lsn
);
...
...
@@ -331,6 +332,27 @@ vcdplayer_play_default( input_thread_t * p_input )
}
else
{
dbg_print
(
INPUT_DBG_PBC
,
"no DEFAULT for LID %d
\n
"
,
p_vcd
->
cur_lid
);
}
#else
vcdinfo_lid_get_pxd
(
p_vcd
->
vcd
,
&
(
p_vcd
->
pxd
),
p_vcd
->
cur_lid
);
switch
(
p_vcd
->
pxd
.
descriptor_type
)
{
case
PSD_TYPE_SELECTION_LIST
:
case
PSD_TYPE_EXT_SELECTION_LIST
:
if
(
p_vcd
->
pxd
.
psd
==
NULL
)
return
false
;
vcdplayer_update_entry
(
p_input
,
vcdinfo_get_default_offset
(
p_vcd
->
vcd
,
p_vcd
->
cur_lid
),
&
itemid
.
num
,
"default"
);
break
;
case
PSD_TYPE_PLAY_LIST
:
case
PSD_TYPE_END_LIST
:
case
PSD_TYPE_COMMAND_LIST
:
LOG_WARN
(
"There is no PBC 'default' selection here"
);
return
false
;
}
#endif
/* LIBVCD_VERSION (< 0.7.21) */
}
else
{
...
...
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