Skip to content

V
vlc-1.1
Commit 20d9ce55 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Fix breakage in transcode_audio_new().

parent ff8c2080
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 8 deletions
modules/stream_out/transcode.c
View file @ 20d9ce55
...@@ -1353,13 +1353,13 @@ static int transcode_audio_new( sout_stream_t *p_stream, ...@@ -1353,13 +1353,13 @@ static int transcode_audio_new( sout_stream_t *p_stream,
es_format_Init( &id->p_encoder->fmt_in, AUDIO_ES, VLC_FOURCC('f','l','3','2') ); es_format_Init( &id->p_encoder->fmt_in, AUDIO_ES, VLC_FOURCC('f','l','3','2') );
id->p_encoder->fmt_in.audio.i_format = VLC_FOURCC('f','l','3','2'); id->p_encoder->fmt_in.audio.i_format = VLC_FOURCC('f','l','3','2');
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 );
...@@ -1378,9 +1378,9 @@ static int transcode_audio_new( sout_stream_t *p_stream, ...@@ -1378,9 +1378,9 @@ 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 );
/* Fix AAC SBR changing number of channels and sampling rate */ /* Fix AAC SBR changing number of channels and sampling rate */
if( id->p_decoder->fmt_in.i_codec == VLC_FOURCC('m','p','4','a') && if( ( id->p_decoder->fmt_in.i_codec == VLC_FOURCC('m','p','4','a') ) &&
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 ) &&
fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ) ( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ) )
{ {
id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate; id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;
id->p_encoder->fmt_out.audio.i_rate = fmt_last.audio.i_rate; id->p_encoder->fmt_out.audio.i_rate = fmt_last.audio.i_rate;
...@@ -2781,7 +2781,6 @@ static int transcode_spu_process( sout_stream_t *p_stream, ...@@ -2781,7 +2781,6 @@ static int transcode_spu_process( sout_stream_t *p_stream,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
} }
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