github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-10-14 11:54:36 +02:00
Code Releases Activity

Do not free demuxer before using demuxer->desc->type (happened when using -audiofile).

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16292 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2005-08-23 08:03:26 +00:00
parent 33cb784664
commit dead4d1193
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmpdemux/demux_demuxers.c
View File

@ -104,12 +104,6 @@ static void demux_close_demuxers(demuxer_t* demuxer) {
}
free(priv);
if(demuxer->info) {
for(i=0;demuxer->info[i] != NULL; i++)
free(demuxer->info[i]);
free(demuxer->info);
}
free(demuxer);
}

3
libmpdemux/demuxer.c
View File

@ -260,7 +260,7 @@ void free_demuxer(demuxer_t *demuxer){
demuxer->desc->close(demuxer);
// Very ugly hack to make it behave like old implementation
if (demuxer->desc->type == DEMUXER_TYPE_DEMUXERS)
return;
goto skip_streamfree;
// free streams:
for(i = 0; i < MAX_A_STREAMS; i++)
if(demuxer->a_streams[i]) free_sh_audio(demuxer->a_streams[i]);
@ -272,6 +272,7 @@ void free_demuxer(demuxer_t *demuxer){
free_demuxer_stream(demuxer->audio);
free_demuxer_stream(demuxer->video);
free_demuxer_stream(demuxer->sub);
skip_streamfree:
if(demuxer->info) {
for(i=0;demuxer->info[i] != NULL; i++)
free(demuxer->info[i]);