summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libmpcodecs/dec_audio.c1
-rw-r--r--mplayer.c7
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 :(
}
diff --git a/mplayer.c b/mplayer.c
index 728e1284cc..497f6ebdc3 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -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