[FFmpeg-cvslog] aacdec: don't return frames without data from aac_decode_er_frame

[Andreas Cadhalpun]

ffmpeg | branch: release/2.8 | Andreas Cadhalpun <andreas.cadhalpun at googlemail.com> | Mon Nov  9 22:16:01 2015 +0100| [ce2664f5f727b9d86fcf49a72b6a30d1ec2856e5] | committer: Michael Niedermayer

aacdec: don't return frames without data from aac_decode_er_frame

This is similar to commit ec38a1b for aac_decode_frame_int.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit d7f29bfa6985e3eea2033dba0449e47b41b85928)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ce2664f5f727b9d86fcf49a72b6a30d1ec2856e5
---

 libavcodec/aacdec_template.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
index c2d7d05..fb1ce2c 100644
--- a/libavcodec/aacdec_template.c
+++ b/libavcodec/aacdec_template.c
@@ -2889,6 +2889,11 @@ static int aac_decode_er_frame(AVCodecContext *avctx, void *data,
 
     spectral_to_sample(ac, samples);
 
+    if (!ac->frame->data[0] && samples) {
+        av_log(avctx, AV_LOG_ERROR, "no frame data found\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     ac->frame->nb_samples = samples;
     ac->frame->sample_rate = avctx->sample_rate;
     *got_frame_ptr = 1;