Skip to content

V
vlc
Commit 54dc1499 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

transcode: If no module is explicitely selected, print that we are potentially using any module.

parent f60fff1a
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 8 deletions
modules/stream_out/transcode.c
View file @ 54dc1499
...@@ -1401,8 +1401,9 @@ static int transcode_audio_new( sout_stream_t *p_stream, ...@@ -1401,8 +1401,9 @@ static int transcode_audio_new( sout_stream_t *p_stream,
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 ) if( !id->p_encoder->p_module )
{ {
msg_Err( p_stream, "cannot find audio encoder (%s/%4.4s)", msg_Err( p_stream, "cannot find audio encoder (module:%s fourcc:%4.4s)",
p_sys->psz_aenc, (char *)&p_sys->i_acodec ); p_sys->psz_aenc ? p_sys->psz_aenc : "any",
(char *)&p_sys->i_acodec );
module_Unneed( id->p_decoder, id->p_decoder->p_module ); module_Unneed( id->p_decoder, id->p_decoder->p_module );
id->p_decoder->p_module = NULL; id->p_decoder->p_module = NULL;
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -1496,8 +1497,9 @@ static int transcode_audio_new( sout_stream_t *p_stream, ...@@ -1496,8 +1497,9 @@ static int transcode_audio_new( sout_stream_t *p_stream,
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 ) if( !id->p_encoder->p_module )
{ {
msg_Err( p_stream, "cannot find audio encoder (%s/%4.4s)", msg_Err( p_stream, "cannot find audio encoder (module:%s fourcc:%4.4s)",
p_sys->psz_aenc, (char *)&p_sys->i_acodec ); p_sys->psz_aenc ? p_sys->psz_aenc : "any",
(char *)&p_sys->i_acodec );
transcode_audio_close( id ); transcode_audio_close( id );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1837,8 +1839,9 @@ static int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id ) ...@@ -1837,8 +1839,9 @@ static int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
module_Need( id->p_encoder, "encoder", p_sys->psz_venc, true ); module_Need( id->p_encoder, "encoder", p_sys->psz_venc, true );
if( !id->p_encoder->p_module ) if( !id->p_encoder->p_module )
{ {
msg_Err( p_stream, "cannot find video encoder (%s/%4.4s)", msg_Err( p_stream, "cannot find video encoder (module:%s fourcc:%4.4s)",
p_sys->psz_venc, (char *)&p_sys->i_vcodec ); p_sys->psz_venc ? p_sys->psz_venc : "any",
(char *)&p_sys->i_vcodec );
module_Unneed( id->p_decoder, id->p_decoder->p_module ); module_Unneed( id->p_decoder, id->p_decoder->p_module );
id->p_decoder->p_module = 0; id->p_decoder->p_module = 0;
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -2152,8 +2155,9 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream, ...@@ -2152,8 +2155,9 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream,
module_Need( id->p_encoder, "encoder", p_sys->psz_venc, true ); module_Need( id->p_encoder, "encoder", p_sys->psz_venc, true );
if( !id->p_encoder->p_module ) if( !id->p_encoder->p_module )
{ {
msg_Err( p_stream, "cannot find video encoder (%s/%4.4s)", msg_Err( p_stream, "cannot find video encoder (module:%s fourcc:%4.4s)",
p_sys->psz_venc, (char *)&p_sys->i_vcodec ); p_sys->psz_venc ? p_sys->psz_venc : "any",
(char *)&p_sys->i_vcodec );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment