Skip to content

V
vlc
Commit cd2f1447 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed avcodec wrapper with unrecognized audio layout.

parent 1c1965d5
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
modules/codec/avcodec/audio.c
View file @ cd2f1447
...@@ -243,7 +243,7 @@ static aout_buffer_t *SplitBuffer( decoder_t *p_dec ) ...@@ -243,7 +243,7 @@ static aout_buffer_t *SplitBuffer( decoder_t *p_dec )
else else
memcpy( p_buffer->p_buffer, p_sys->p_samples, p_buffer->i_nb_bytes ); memcpy( p_buffer->p_buffer, p_sys->p_samples, p_buffer->i_nb_bytes );
p_sys->p_samples += p_buffer->i_nb_bytes; p_sys->p_samples += i_samples * p_sys->p_context->channels * ( p_dec->fmt_out.audio.i_bitspersample / 8 );
p_sys->i_samples -= i_samples; p_sys->i_samples -= i_samples;
return p_buffer; return p_buffer;
...@@ -481,7 +481,6 @@ static void SetupOutputFormat( decoder_t *p_dec, bool b_trust ) ...@@ -481,7 +481,6 @@ static void SetupOutputFormat( decoder_t *p_dec, bool b_trust )
p_dec->fmt_out.audio.i_bitspersample = 16; p_dec->fmt_out.audio.i_bitspersample = 16;
#endif #endif
p_dec->fmt_out.audio.i_rate = p_sys->p_context->sample_rate; p_dec->fmt_out.audio.i_rate = p_sys->p_context->sample_rate;
p_dec->fmt_out.audio.i_channels = p_sys->p_context->channels;
/* */ /* */
#if defined(LIBAVCODEC_AUDIO_LAYOUT) #if defined(LIBAVCODEC_AUDIO_LAYOUT)
......
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