Skip to content

V
vlc-2-2
Commit abd58acc authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/stream_out/transcode.c: fix for channels mapping.

parent 64ba020d
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 5 deletions
modules/stream_out/transcode.c
View file @ abd58acc
...@@ -872,7 +872,13 @@ static int transcode_audio_new( sout_stream_t *p_stream, ...@@ -872,7 +872,13 @@ static int transcode_audio_new( sout_stream_t *p_stream,
/* Sanity check for audio channels */ /* Sanity check for audio channels */
id->p_encoder->fmt_out.audio.i_channels = id->p_encoder->fmt_out.audio.i_channels =
__MIN( id->p_encoder->fmt_out.audio.i_channels, __MIN( id->p_encoder->fmt_out.audio.i_channels,
id->p_decoder->fmt_in.audio.i_channels ); id->p_decoder->fmt_out.audio.i_channels );
if( id->p_decoder->fmt_out.audio.i_channels ==
id->p_encoder->fmt_out.audio.i_channels )
id->p_encoder->fmt_out.audio.i_physical_channels =
id->p_encoder->fmt_out.audio.i_original_channels =
id->p_decoder->fmt_out.audio.i_physical_channels;
else
id->p_encoder->fmt_out.audio.i_physical_channels = id->p_encoder->fmt_out.audio.i_physical_channels =
id->p_encoder->fmt_out.audio.i_original_channels = id->p_encoder->fmt_out.audio.i_original_channels =
pi_channels_maps[id->p_encoder->fmt_out.audio.i_channels]; pi_channels_maps[id->p_encoder->fmt_out.audio.i_channels];
...@@ -883,7 +889,7 @@ static int transcode_audio_new( sout_stream_t *p_stream, ...@@ -883,7 +889,7 @@ static int transcode_audio_new( sout_stream_t *p_stream,
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_encoder->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_in.audio.i_original_channels = id->p_encoder->fmt_in.audio.i_original_channels =
pi_channels_maps[id->p_encoder->fmt_out.audio.i_channels]; id->p_encoder->fmt_out.audio.i_physical_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_encoder->fmt_out.audio.i_channels;
id->p_encoder->fmt_in.audio.i_bitspersample = 16; id->p_encoder->fmt_in.audio.i_bitspersample = 16;
......
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