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
62ac11ae
Commit
62ac11ae
authored
Nov 19, 2010
by
Pierre Ynard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vlm: accept "ps" and "ts" as mux arguments
Having to type "mux mp2t" was lame
parent
1a9c88e2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
src/input/vlm.c
src/input/vlm.c
+9
-1
No files found.
src/input/vlm.c
View file @
62ac11ae
...
...
@@ -639,11 +639,19 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media )
if
(
p_cfg
->
vod
.
psz_mux
)
{
const
char
*
psz_mux
;
if
(
!
strcmp
(
p_cfg
->
vod
.
psz_mux
,
"ps"
))
psz_mux
=
"mp2p"
;
else
if
(
!
strcmp
(
p_cfg
->
vod
.
psz_mux
,
"ts"
))
psz_mux
=
"mp2t"
;
else
psz_mux
=
p_cfg
->
vod
.
psz_mux
;
input_item_t
item
;
es_format_t
es
,
*
p_es
=
&
es
;
union
{
char
text
[
5
];
uint32_t
value
;
}
fourcc
;
sprintf
(
fourcc
.
text
,
"%4.4s"
,
p
_cfg
->
vod
.
p
sz_mux
);
sprintf
(
fourcc
.
text
,
"%4.4s"
,
psz_mux
);
fourcc
.
text
[
0
]
=
tolower
(
fourcc
.
text
[
0
]);
fourcc
.
text
[
1
]
=
tolower
(
fourcc
.
text
[
1
]);
fourcc
.
text
[
2
]
=
tolower
(
fourcc
.
text
[
2
]);
...
...
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