From: Stefano Sabatini Date: Thu, 28 Jun 2012 21:50:35 +0000 (+0200) Subject: ffplay: vertially align complex if condition in audio_decode_frame() X-Git-Tag: android-x86-4.4-r1~10940 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8179660222ec27b61d072ede8e515999c44b81da;p=android-x86%2Fexternal-ffmpeg.git ffplay: vertially align complex if condition in audio_decode_frame() Possibly improve readability. --- diff --git a/ffplay.c b/ffplay.c index f8a18d4b78..de78db92dc 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1961,9 +1961,9 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) dec->channel_layout : av_get_default_channel_layout(dec->channels); wanted_nb_samples = synchronize_audio(is, is->frame->nb_samples); - if (dec->sample_fmt != is->audio_src.fmt || + if (dec->sample_fmt != is->audio_src.fmt || dec_channel_layout != is->audio_src.channel_layout || - dec->sample_rate != is->audio_src.freq || + dec->sample_rate != is->audio_src.freq || (wanted_nb_samples != is->frame->nb_samples && !is->swr_ctx)) { swr_free(&is->swr_ctx); is->swr_ctx = swr_alloc_set_opts(NULL,