Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
fb364585
Commit
fb364585
authored
Jan 14, 2008
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't copy 'meta-file' option to inputs
parent
c0ac271e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
include/vlc_input.h
include/vlc_input.h
+5
-0
src/playlist/loadsave.c
src/playlist/loadsave.c
+0
-8
No files found.
include/vlc_input.h
View file @
fb364585
...
@@ -106,6 +106,11 @@ static inline void input_ItemCopyOptions( input_item_t *p_parent,
...
@@ -106,6 +106,11 @@ static inline void input_ItemCopyOptions( input_item_t *p_parent,
for
(
i
=
0
;
i
<
p_parent
->
i_options
;
i
++
)
for
(
i
=
0
;
i
<
p_parent
->
i_options
;
i
++
)
{
{
char
*
psz_option
=
strdup
(
p_parent
->
ppsz_options
[
i
]
);
char
*
psz_option
=
strdup
(
p_parent
->
ppsz_options
[
i
]
);
if
(
!
strcmp
(
psz_option
,
"meta-file"
)
)
{
free
(
psz_option
);
continue
;
}
p_child
->
i_options
++
;
p_child
->
i_options
++
;
p_child
->
ppsz_options
=
(
char
**
)
realloc
(
p_child
->
ppsz_options
,
p_child
->
ppsz_options
=
(
char
**
)
realloc
(
p_child
->
ppsz_options
,
p_child
->
i_options
*
p_child
->
i_options
*
...
...
src/playlist/loadsave.c
View file @
fb364585
...
@@ -97,14 +97,6 @@ static void input_item_subitem_added( const vlc_event_t * p_event,
...
@@ -97,14 +97,6 @@ static void input_item_subitem_added( const vlc_event_t * p_event,
playlist_t
*
p_playlist
=
user_data
;
playlist_t
*
p_playlist
=
user_data
;
input_item_t
*
p_item
=
p_event
->
u
.
input_item_subitem_added
.
p_new_child
;
input_item_t
*
p_item
=
p_event
->
u
.
input_item_subitem_added
.
p_new_child
;
/* The media library input has one and only one option: "meta-file"
* So we remove that unneeded option. */
if
(
p_item
->
i_options
==
1
)
{
free
(
p_item
->
ppsz_options
[
0
]
);
p_item
->
i_options
=
0
;
}
playlist_AddInput
(
p_playlist
,
p_item
,
PLAYLIST_APPEND
,
PLAYLIST_END
,
playlist_AddInput
(
p_playlist
,
p_item
,
PLAYLIST_APPEND
,
PLAYLIST_END
,
VLC_FALSE
,
VLC_FALSE
);
VLC_FALSE
,
VLC_FALSE
);
}
}
...
...
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