diff options
-rw-r--r-- | libao2/audio_out.c | 1 | ||||
-rw-r--r-- | libmpdemux/demuxer.c | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c index b12c6403a4..79419d9d3f 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -156,6 +156,7 @@ ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate,int c } } // continue... + free(ao); ++ao_list; if(!(ao_list[0])) return NULL; // do NOT fallback to others } diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index d5bb70b01f..4c403d176d 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -703,11 +703,12 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){ if(id==formtypeAVI){ mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"AVI"); file_format=DEMUXER_TYPE_AVI; - } else { - free_demuxer(demuxer); - demuxer = NULL; } } + if (file_format==DEMUXER_TYPE_UNKNOWN) { + free_demuxer(demuxer); + demuxer = NULL; + } } } //=============== Try to open as Y4M file: ================= |