[FFmpeg-devel] [PATCH] ffplay: vertially align complex if condition in audio_decode_frame()
Marton Balint
cus at passwd.hu
Fri Jun 29 21:27:18 CEST 2012
On Fri, 29 Jun 2012, Stefano Sabatini wrote:
> Possibly improve readability.
> ---
> ffplay.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
LGTM, thanks.
>
> diff --git a/ffplay.c b/ffplay.c
> index fdd281b..e8f6e6b 100644
> --- a/ffplay.c
> +++ b/ffplay.c
> @@ -1967,9 +1967,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)) {
> if (is->swr_ctx)
> swr_free(&is->swr_ctx);
> --
> 1.7.5.4
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
More information about the ffmpeg-devel
mailing list