player: close demuxer before stream

Demuxer might access stream even when closing. For now, this is not
a real problem (because it didn't actually happen), but it's cleaner.
This commit is contained in:
wm4
2013-11-24 14:44:58 +01:00
parent 4012c4a96e
commit ae709b5c03
+3 -2
View File
@@ -122,9 +122,10 @@ void uninit_player(struct MPContext *mpctx, unsigned int mask)
for (int i = 0; i < mpctx->num_sources; i++) {
uninit_subs(mpctx->sources[i]);
struct demuxer *demuxer = mpctx->sources[i];
if (demuxer->stream != mpctx->stream)
free_stream(demuxer->stream);
struct stream *stream = demuxer->stream;
free_demuxer(demuxer);
if (stream != mpctx->stream)
free_stream(stream);
}
talloc_free(mpctx->sources);
mpctx->sources = NULL;