[FFmpeg-cvslog] aac: Reset PS parameters on header decode failure.
Alex Converse
git at videolan.org
Sat Mar 24 11:31:28 CET 2012
ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Wed Mar 21 10:11:02 2012 -0700| [a237b38021cd3009cc78eeb974b596085f2fe393] | committer: Alex Converse
aac: Reset PS parameters on header decode failure.
If the next header frame codes zero envelopes the previous frame's
values will be used. Consequently the invalid values must be cleared.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a237b38021cd3009cc78eeb974b596085f2fe393
---
libavcodec/aacps.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/libavcodec/aacps.c b/libavcodec/aacps.c
index 3da912c..6c9dcf2 100644
--- a/libavcodec/aacps.c
+++ b/libavcodec/aacps.c
@@ -275,6 +275,10 @@ int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb_host, PSContext *ps
err:
ps->start = 0;
skip_bits_long(gb_host, bits_left);
+ memset(ps->iid_par, 0, sizeof(ps->iid_par));
+ memset(ps->icc_par, 0, sizeof(ps->icc_par));
+ memset(ps->ipd_par, 0, sizeof(ps->ipd_par));
+ memset(ps->opd_par, 0, sizeof(ps->opd_par));
return bits_left;
}
More information about the ffmpeg-cvslog
mailing list