diff options
| author | Mike Melanson <mike@multimedia.cx> | 2004-03-14 21:14:07 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2004-03-14 21:14:07 +0000 |
| commit | 0d90aec0fd7428a77b5c4c536ab65635669bc42d (patch) | |
| tree | 9eb56c6c1176bf6a6f3ae65199a3f43aa8c2aa2d /src/libffmpeg/libavcodec/mpegaudiodec.c | |
| parent | b4d3aa3dcce07b90098e33c37b563e797378d0f1 (diff) | |
| download | xine-lib-0d90aec0fd7428a77b5c4c536ab65635669bc42d.tar.gz xine-lib-0d90aec0fd7428a77b5c4c536ab65635669bc42d.tar.bz2 | |
sync to ffmpeg build 4707
CVS patchset: 6253
CVS date: 2004/03/14 21:14:07
Diffstat (limited to 'src/libffmpeg/libavcodec/mpegaudiodec.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/mpegaudiodec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/mpegaudiodec.c b/src/libffmpeg/libavcodec/mpegaudiodec.c index 09e9b8cdb..58caf6510 100644 --- a/src/libffmpeg/libavcodec/mpegaudiodec.c +++ b/src/libffmpeg/libavcodec/mpegaudiodec.c @@ -1231,6 +1231,7 @@ static int decode_header(MPADecodeContext *s, uint32_t header) int mpa_decode_header(AVCodecContext *avctx, uint32_t head) { MPADecodeContext s1, *s = &s1; + memset( s, 0, sizeof(MPADecodeContext) ); if (check_header(head) != 0) return -1; @@ -1373,6 +1374,10 @@ static int mp_decode_layer2(MPADecodeContext *s) bound = sblimit; dprintf("bound=%d sblimit=%d\n", bound, sblimit); + + /* sanity check */ + if( bound > sblimit ) bound = sblimit; + /* parse bit allocation */ j = 0; for(i=0;i<bound;i++) { |