summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-08 00:30:30 +0100
committerwm4 <wm4@nowhere>2012-11-08 00:32:49 +0100
commited2c54cea99fc5b3a28c2df9370db3aa88b256cc (patch)
tree8fffcf6b6fc473e2706ae07a419bc12b38264826 /libmpdemux/demuxer.c
parentfae73079310eef9dce9737f2e37ff4b80c8830ee (diff)
downloadmpv-ed2c54cea99fc5b3a28c2df9370db3aa88b256cc.tar.bz2
mpv-ed2c54cea99fc5b3a28c2df9370db3aa88b256cc.tar.xz
demux_mkv: don't crash on tracks with unknown audio codecs
Demuxers can't remove streams anymore after adding them, so the free_sh_audio() call caused a crash.
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index b827a64018..1119e61013 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -400,7 +400,7 @@ sh_audio_t *new_sh_audio_aid(demuxer_t *demuxer, int id, int aid)
return demuxer->a_streams[id];
}
-void free_sh_audio(demuxer_t *demuxer, int id)
+static void free_sh_audio(demuxer_t *demuxer, int id)
{
sh_audio_t *sh = demuxer->a_streams[id];
demuxer->a_streams[id] = NULL;
@@ -429,7 +429,7 @@ sh_video_t *new_sh_video_vid(demuxer_t *demuxer, int id, int vid)
return demuxer->v_streams[id];
}
-void free_sh_video(sh_video_t *sh)
+static void free_sh_video(sh_video_t *sh)
{
mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_video at %p\n", sh);
free(sh->bih);