diff options
author | Stefano Sabatini <stefasab@gmail.com> | 2012-06-28 23:48:49 +0200 |
---|---|---|
committer | Stefano Sabatini <stefasab@gmail.com> | 2012-06-29 23:15:45 +0200 |
commit | 347ecfdc63f939419ad6e66bc33f611c07ca9304 (patch) | |
tree | 812c2e0367ef7a1ac6d0a6ee2f6a2c550c35305b /ffplay.c | |
parent | 0d3ffde64fce055f552a74c703b8917f3f101be8 (diff) | |
download | ffmpeg-347ecfdc63f939419ad6e66bc33f611c07ca9304.tar.gz |
ffplay: move assignment in else block in audio_decode_frame()
Avoid confusing and pointless double assignment of variable
resampled_data_size.
Diffstat (limited to 'ffplay.c')
-rw-r--r-- | ffplay.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 */ |