From 347ecfdc63f939419ad6e66bc33f611c07ca9304 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Thu, 28 Jun 2012 23:48:49 +0200 Subject: [PATCH] ffplay: move assignment in else block in audio_decode_frame() Avoid confusing and pointless double assignment of variable resampled_data_size. --- ffplay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffplay.c b/ffplay.c index 8d2e2affbb..f8a18d4b78 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1986,7 +1986,6 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) is->audio_src.fmt = dec->sample_fmt; } - resampled_data_size = data_size; if (is->swr_ctx) { const uint8_t *in[] = { is->frame->data[0] }; uint8_t *out[] = {is->audio_buf2}; @@ -2011,6 +2010,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) resampled_data_size = len2 * is->audio_tgt.channels * av_get_bytes_per_sample(is->audio_tgt.fmt); } else { is->audio_buf = is->frame->data[0]; + resampled_data_size = data_size; } /* if no pts, then compute it */ -- 2.11.0