[FFmpeg-soc] [soc]: r2727 - aac/aac.c

superdump subversion at mplayerhq.hu
Tue Jul 8 01:21:40 CEST 2008


Author: superdump
Date: Tue Jul  8 01:21:40 2008
New Revision: 2727

Log:
Fix bug where ff_mpeg4audio_get_config() can be called with a NULL extradata
ptr. Fixes segfault with lol-mplayer.aac.


Modified:
   aac/aac.c

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Tue Jul  8 01:21:40 2008
@@ -787,7 +787,8 @@ static av_cold int aac_decode_init(AVCod
 
     ac->avccontext = avccontext;
 
-    if (AudioSpecificConfig(ac, avccontext->extradata, avccontext->extradata_size))
+    if (avccontext->extradata && avccontext->extradata_size &&
+        AudioSpecificConfig(ac, avccontext->extradata, avccontext->extradata_size))
         return -1;
 
     avccontext->sample_rate = ac->m4ac.sample_rate;



More information about the FFmpeg-soc mailing list