Skip to content

V
vlc-2-2
Commit 68dec867 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed a regression with avcodec due to 83f58a50

parent 77c069c6
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
modules/codec/avcodec/audio.c
View file @ 68dec867
......@@ -457,10 +457,12 @@ static void SetupOutputFormat( decoder_t *p_dec, bool b_trust )
p_dec->fmt_out.audio.i_channels = p_sys->p_context->channels;
/* */
if( p_sys->i_previous_channels == p_sys->p_context->channels )
return;
#if defined(LIBAVCODEC_AUDIO_LAYOUT)
if( p_sys->i_previous_layout == p_sys->p_context->channel_layout )
if( p_sys->i_previous_channels == p_sys->p_context->channels &&
p_sys->i_previous_layout == p_sys->p_context->channel_layout )
return;
#else
if( p_sys->i_previous_channels == p_sys->p_context->channels )
return;
#endif
if( b_trust )
......
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