Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
505c5584
Commit
505c5584
authored
Nov 22, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use input_item_GetName instead of direct access to an item.
It will allows proper locking of p_item.
parent
beb3e94f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
modules/demux/playlist/asx.c
modules/demux/playlist/asx.c
+8
-2
No files found.
modules/demux/playlist/asx.c
View file @
505c5584
...
...
@@ -497,8 +497,12 @@ static int Demux( demux_t *p_demux )
if
(
p_sys
->
b_skip_ads
&&
b_skip_entry
)
{
char
*
psz_current_input_name
=
input_item_GetName
(
p_current_input
);
msg_Dbg
(
p_demux
,
"skipped entry %d %s (%s)"
,
i_entry_count
,
(
psz_title_entry
?
psz_title_entry
:
p_current_input
->
psz_name
),
psz_href
);
i_entry_count
,
(
psz_title_entry
?
psz_title_entry
:
psz_current_input_name
),
psz_href
);
free
(
psz_current_input_name
);
}
else
{
...
...
@@ -521,7 +525,8 @@ static int Demux( demux_t *p_demux )
}
/* create the new entry */
if
(
asprintf
(
&
psz_name
,
"%d %s"
,
i_entry_count
,
(
psz_title_entry
?
psz_title_entry
:
p_current_input
->
psz_name
)
)
!=
-
1
)
char
*
psz_current_input_name
=
input_item_GetName
(
p_current_input
);
if
(
asprintf
(
&
psz_name
,
"%d %s"
,
i_entry_count
,
(
psz_title_entry
?
psz_title_entry
:
psz_current_input_name
)
)
!=
-
1
)
{
p_entry
=
input_item_NewExt
(
p_demux
,
psz_href
,
psz_name
,
i_options
,
(
const
char
*
const
*
)
ppsz_options
,
-
1
);
FREENULL
(
psz_name
);
...
...
@@ -540,6 +545,7 @@ static int Demux( demux_t *p_demux )
input_item_AddSubItem
(
p_current_input
,
p_entry
);
vlc_gc_decref
(
p_entry
);
}
free
(
psz_current_input_name
);
}
/* cleanup entry */
;
...
...
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