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
737dd525
Commit
737dd525
authored
Feb 09, 2014
by
Ilkka Ollakka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
transcode: check codec aliasing for SPU also
parent
7506a447
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
modules/stream_out/transcode/transcode.c
modules/stream_out/transcode/transcode.c
+4
-3
No files found.
modules/stream_out/transcode/transcode.c
View file @
737dd525
...
@@ -413,9 +413,10 @@ static int Open( vlc_object_t *p_this )
...
@@ -413,9 +413,10 @@ static int Open( vlc_object_t *p_this )
psz_string
=
var_GetString
(
p_stream
,
SOUT_CFG_PREFIX
"scodec"
);
psz_string
=
var_GetString
(
p_stream
,
SOUT_CFG_PREFIX
"scodec"
);
if
(
psz_string
&&
*
psz_string
)
if
(
psz_string
&&
*
psz_string
)
{
{
char
fcc
[
4
]
=
"
"
;
char
fcc
[
5
]
=
"
\0
"
;
memcpy
(
fcc
,
psz_string
,
__MIN
(
strlen
(
psz_string
),
4
)
);
memcpy
(
fcc
,
psz_string
,
__MIN
(
strlen
(
psz_string
),
4
)
);
p_sys
->
i_scodec
=
VLC_FOURCC
(
fcc
[
0
],
fcc
[
1
],
fcc
[
2
],
fcc
[
3
]
);
p_sys
->
i_scodec
=
vlc_fourcc_GetCodecFromString
(
SPU_ES
,
fcc
);
msg_Dbg
(
p_stream
,
"Checking spu codec mapping for %s got %4.4s "
,
fcc
,
(
char
*
)
&
p_sys
->
i_scodec
);
}
}
free
(
psz_string
);
free
(
psz_string
);
...
@@ -555,7 +556,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
...
@@ -555,7 +556,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
else
if
(
p_fmt
->
i_cat
==
VIDEO_ES
&&
p_sys
->
i_vcodec
)
else
if
(
p_fmt
->
i_cat
==
VIDEO_ES
&&
p_sys
->
i_vcodec
)
success
=
transcode_video_add
(
p_stream
,
p_fmt
,
id
);
success
=
transcode_video_add
(
p_stream
,
p_fmt
,
id
);
else
if
(
(
p_fmt
->
i_cat
==
SPU_ES
)
&&
else
if
(
(
p_fmt
->
i_cat
==
SPU_ES
)
&&
(
p_sys
->
i_scodec
||
p_sys
->
psz_senc
||
p_sys
->
b_soverlay
)
)
(
p_sys
->
i_scodec
||
p_sys
->
b_soverlay
)
)
success
=
transcode_spu_add
(
p_stream
,
p_fmt
,
id
);
success
=
transcode_spu_add
(
p_stream
,
p_fmt
,
id
);
else
if
(
!
p_sys
->
b_osd
&&
(
p_sys
->
i_osdcodec
!=
0
||
p_sys
->
psz_osdenc
)
)
else
if
(
!
p_sys
->
b_osd
&&
(
p_sys
->
i_osdcodec
!=
0
||
p_sys
->
psz_osdenc
)
)
success
=
transcode_osd_add
(
p_stream
,
p_fmt
,
id
);
success
=
transcode_osd_add
(
p_stream
,
p_fmt
,
id
);
...
...
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