diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-28 00:59:34 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-28 00:59:34 +0000 |
commit | 12e073b63829ebaff46a682721bf16cac6134dc2 (patch) | |
tree | 5d2cc60381f7da026203caffeb587e5e7e4d1d01 | |
parent | 7d11e17fb3301d375b78fe635676add63ad19164 (diff) | |
download | mpv-12e073b63829ebaff46a682721bf16cac6134dc2.tar.bz2 mpv-12e073b63829ebaff46a682721bf16cac6134dc2.tar.xz |
1000l bug (double free() when libaf init failed)
thanx for their help:
Michael Mauch <michael.mauch@gmx.de>
Marc Packenius <marc@freenet-rz.de>
Bartek Kulicki <bartek@interecho.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9133 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libmpcodecs/dec_audio.c | 1 | ||||
-rw-r--r-- | mplayer.c | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index 6f31cb2a88..731b6cff5e 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -353,6 +353,7 @@ int init_audio_filters(sh_audio_t *sh_audio, // let's autoprobe it! if(0 != af_init(afs,1)){ + sh_audio->afilter=NULL; free(afs); return 0; // failed :( } @@ -1676,13 +1676,6 @@ if(sh_audio){ audio_out_format_bits(ao_data.format)/8, /* ao_data.bps, */ ao_data.outburst*4, ao_data.buffersize)){ mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format!\n"); -#if 0 - if(sh_audio->afilter){ - free(sh_audio->afilter); sh_audio->afilter=NULL; - } -#else - sh_audio->afilter=NULL; -#endif // mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format! -> NOSOUND\n"); // uninit_player(INITED_ACODEC|INITED_AO); // close codec & ao // sh_audio=d_audio->sh=NULL; // -> nosound |