[FFmpeg-devel] [PATCH] aacdec: remove a duplicated line

Andreas Cadhalpun andreas.cadhalpun at googlemail.com
Tue May 12 22:06:22 CEST 2015


got_frame_ptr is set again after the if block.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
---
 libavcodec/aacdec.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index a405faf..48cf637 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -3076,13 +3076,12 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
     if (!ac->frame->data[0] && samples) {
         av_log(avctx, AV_LOG_ERROR, "no frame data found\n");
         err = AVERROR_INVALIDDATA;
         goto fail;
     }
 
-    *got_frame_ptr = !!samples;
     if (samples) {
         ac->frame->nb_samples = samples;
         ac->frame->sample_rate = avctx->sample_rate;
     } else
         av_frame_unref(ac->frame);
     *got_frame_ptr = !!samples;
-- 
2.1.4


More information about the ffmpeg-devel mailing list