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
d3bc3292
Commit
d3bc3292
authored
Feb 09, 2014
by
Ilkka Ollakka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
transcode: don't try to setup transcode chain if there isn't audio codec defined
parent
bacd5123
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
modules/stream_out/transcode/audio.c
modules/stream_out/transcode/audio.c
+2
-1
modules/stream_out/transcode/transcode.c
modules/stream_out/transcode/transcode.c
+1
-1
No files found.
modules/stream_out/transcode/audio.c
View file @
d3bc3292
...
@@ -94,7 +94,8 @@ static int transcode_audio_initialize_encoder( sout_stream_id_t *id, sout_stream
...
@@ -94,7 +94,8 @@ static int transcode_audio_initialize_encoder( sout_stream_id_t *id, sout_stream
id
->
p_encoder
->
p_cfg
=
p_stream
->
p_sys
->
p_audio_cfg
;
id
->
p_encoder
->
p_cfg
=
p_stream
->
p_sys
->
p_audio_cfg
;
id
->
p_encoder
->
p_module
=
id
->
p_encoder
->
p_module
=
module_need
(
id
->
p_encoder
,
"encoder"
,
p_sys
->
psz_aenc
,
true
);
module_need
(
id
->
p_encoder
,
"encoder"
,
p_sys
->
psz_aenc
,
true
);
if
(
!
id
->
p_encoder
->
p_module
)
/* p_sys->i_acodec = 0 if there isn't acodec defined */
if
(
!
id
->
p_encoder
->
p_module
&&
p_sys
->
i_acodec
)
{
{
msg_Err
(
p_stream
,
"cannot find audio encoder (module:%s fourcc:%4.4s). "
msg_Err
(
p_stream
,
"cannot find audio encoder (module:%s fourcc:%4.4s). "
"Take a look few lines earlier to see possible reason."
,
"Take a look few lines earlier to see possible reason."
,
...
...
modules/stream_out/transcode/transcode.c
View file @
d3bc3292
...
@@ -549,7 +549,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
...
@@ -549,7 +549,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
bool
success
;
bool
success
;
if
(
p_fmt
->
i_cat
==
AUDIO_ES
&&
(
p_sys
->
i_acodec
||
p_sys
->
psz_aenc
)
)
if
(
p_fmt
->
i_cat
==
AUDIO_ES
&&
p_sys
->
i_acodec
)
success
=
transcode_audio_add
(
p_stream
,
p_fmt
,
id
);
success
=
transcode_audio_add
(
p_stream
,
p_fmt
,
id
);
else
if
(
p_fmt
->
i_cat
==
VIDEO_ES
&&
(
p_sys
->
i_vcodec
||
p_sys
->
psz_venc
)
)
else
if
(
p_fmt
->
i_cat
==
VIDEO_ES
&&
(
p_sys
->
i_vcodec
||
p_sys
->
psz_venc
)
)
success
=
transcode_video_add
(
p_stream
,
p_fmt
,
id
);
success
=
transcode_video_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