Skip to content

V
vlc-1.1
Commit 5e36f2f8 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/stream_out/transcode.c: make acodec/vcodec optional if aenc/venc is specified.

parent 08fefcb7
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
modules/stream_out/transcode.c
View file @ 5e36f2f8
...@@ -459,7 +459,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -459,7 +459,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
id->id = NULL; id->id = NULL;
id->p_encoder = NULL; id->p_encoder = NULL;
if( p_fmt->i_cat == AUDIO_ES && p_sys->i_acodec != 0 ) if( p_fmt->i_cat == AUDIO_ES && (p_sys->i_acodec || p_sys->psz_aenc) )
{ {
msg_Dbg( p_stream, msg_Dbg( p_stream,
"creating audio transcoding from fcc=`%4.4s' to fcc=`%4.4s'", "creating audio transcoding from fcc=`%4.4s' to fcc=`%4.4s'",
...@@ -502,7 +502,8 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -502,7 +502,8 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
return NULL; return NULL;
} }
} }
else if( p_fmt->i_cat == VIDEO_ES && p_sys->i_vcodec != 0 ) else if( p_fmt->i_cat == VIDEO_ES &&
(p_sys->i_vcodec != 0 || p_sys->psz_venc) )
{ {
msg_Dbg( p_stream, msg_Dbg( p_stream,
"creating video transcoding from fcc=`%4.4s' to fcc=`%4.4s'", "creating video transcoding from fcc=`%4.4s' to fcc=`%4.4s'",
......
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