diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-12-12 13:56:35 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-12-16 06:22:19 +0200 |
| commit | 05fa96c6dce2da63d0c1f55b79e2e532df786523 (patch) | |
| tree | 481561037235b912bb3eb71bea5767cfe9995acb | |
| parent | c11757c5afa53c3556252ec32a18f1fa88aa5d5b (diff) | |
| download | mpv-05fa96c6dce2da63d0c1f55b79e2e532df786523.tar.bz2 mpv-05fa96c6dce2da63d0c1f55b79e2e532df786523.tar.xz | |
ad_faad: fix crash when used on an empty audio stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32706 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpcodecs/ad_faad.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index 894d293a8a..63989b2a10 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -129,6 +129,11 @@ static int init(sh_audio_t *sh) faacDecSetConfiguration(faac_hdec, faac_conf); sh->a_in_buffer_len = demux_read_data(sh->ds, sh->a_in_buffer, sh->a_in_buffer_size); + if (!sh->a_in_buffer_len) { + // faad init will crash with 0 buffer length + mp_msg(MSGT_DECAUDIO, MSGL_FATAL, "Could not get audio data!\n"); + return 0; + } #if CONFIG_FAAD_INTERNAL /* init the codec, look for LATM */ faac_init = faacDecInit(faac_hdec, sh->a_in_buffer, |