Skip to content

V
vlc
Commit 28dee96e authored by Jean-Paul Saman's avatar Jean-Paul Saman Committed by Jean-Paul Saman
Browse files
Options

Fix audio filter selection in transcode.

parent ab734ace
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
modules/stream_out/transcode.c
View file @ 28dee96e
...@@ -1329,13 +1329,13 @@ static int transcode_audio_new( sout_stream_t *p_stream, ...@@ -1329,13 +1329,13 @@ static int transcode_audio_new( sout_stream_t *p_stream,
/* Initialization of encoder format structures */ /* Initialization of encoder format structures */
es_format_Init( &id->p_encoder->fmt_in, AUDIO_ES, AOUT_FMT_S16_NE ); es_format_Init( &id->p_encoder->fmt_in, AUDIO_ES, AOUT_FMT_S16_NE );
id->p_encoder->fmt_in.audio.i_format = AOUT_FMT_S16_NE; id->p_encoder->fmt_in.audio.i_format = AOUT_FMT_S16_NE;
id->p_encoder->fmt_in.audio.i_rate = id->p_encoder->fmt_out.audio.i_rate; id->p_encoder->fmt_in.audio.i_rate = id->p_decoder->fmt_out.audio.i_rate;
id->p_encoder->fmt_in.audio.i_physical_channels = id->p_encoder->fmt_in.audio.i_physical_channels =
id->p_encoder->fmt_out.audio.i_physical_channels; id->p_decoder->fmt_out.audio.i_physical_channels;
id->p_encoder->fmt_in.audio.i_original_channels = id->p_encoder->fmt_in.audio.i_original_channels =
id->p_encoder->fmt_out.audio.i_original_channels; id->p_decoder->fmt_out.audio.i_original_channels;
id->p_encoder->fmt_in.audio.i_channels = id->p_encoder->fmt_in.audio.i_channels =
id->p_encoder->fmt_out.audio.i_channels; id->p_decoder->fmt_out.audio.i_channels;
id->p_encoder->fmt_in.audio.i_bitspersample = id->p_encoder->fmt_in.audio.i_bitspersample =
audio_BitsPerSample( id->p_encoder->fmt_in.i_codec ); audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
...@@ -1355,8 +1355,8 @@ static int transcode_audio_new( sout_stream_t *p_stream, ...@@ -1355,8 +1355,8 @@ static int transcode_audio_new( sout_stream_t *p_stream,
audio_BitsPerSample( id->p_encoder->fmt_in.i_codec ); audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
/* Load conversion filters */ /* Load conversion filters */
if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels || if( (fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels) ||
fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate ) (fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate) )
{ {
/* We'll have to go through fl32 first */ /* We'll have to go through fl32 first */
es_format_t fmt_out = id->p_encoder->fmt_in; es_format_t fmt_out = id->p_encoder->fmt_in;
......
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