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
3ae3e5f8
Commit
3ae3e5f8
authored
Apr 12, 2014
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
input: fix access-specified demux (fixes #11185)
parent
1516cebd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
10 deletions
+3
-10
src/input/input.c
src/input/input.c
+3
-10
No files found.
src/input/input.c
View file @
3ae3e5f8
...
...
@@ -2233,15 +2233,8 @@ static int InputSourceInit( input_thread_t *p_input,
/* special hack for forcing a demuxer with --demux=module
* (and do nothing with a list) */
psz_var_demux
=
var_GetNonEmptyString
(
p_input
,
"demux"
);
if
(
psz_var_demux
!=
NULL
&&
!
strchr
(
psz_var_demux
,
','
)
&&
!
strchr
(
psz_var_demux
,
':'
)
)
{
psz_demux
=
psz_var_demux
;
msg_Dbg
(
p_input
,
"enforced demux ` %s'"
,
psz_demux
);
}
psz_demux
=
psz_var_demux
;
msg_Dbg
(
p_input
,
"specified demux `%s'"
,
psz_demux
);
}
/* Try access_demux first */
...
...
@@ -2320,7 +2313,7 @@ static int InputSourceInit( input_thread_t *p_input,
}
/* Access-forced demuxer (PARENTAL ADVISORY: EXPLICIT HACK) */
if
(
!
*
psz_demux
&&
*
p_access
->
psz_demux
)
if
(
!
psz_demux
[
0
]
||
!
strcasecmp
(
psz_demux
,
"any"
)
)
psz_demux
=
p_access
->
psz_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