[FFmpeg-devel] [PATCH] ffplay: move assignment in else block in audio_decode_frame()

Stefano Sabatini stefasab at gmail.com
Fri Jun 29 00:52:36 CEST 2012


Avoid confusing and pointless double assignment of variable
resampled_data_size.
---
 ffplay.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index 7e857a0..fdd281b 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1993,7 +1993,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};
@@ -2018,6 +2017,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 */
-- 
1.7.5.4



More information about the ffmpeg-devel mailing list