Mercurial > mplayer.hg
diff libmpdemux/demuxer.c @ 33237:a8619bfabf84
Add a alloc_demuxer function that ensures all the critical stuff is
initialized and use it also in demux_demuxers.c.
This fixes the OSD counter being stuck at 0.
author | reimar |
---|---|
date | Sun, 24 Apr 2011 23:06:38 +0000 |
parents | e137435bb751 |
children | 45e772bf4d6a |
line wrap: on
line diff
--- a/libmpdemux/demuxer.c Sun Apr 24 21:32:36 2011 +0000 +++ b/libmpdemux/demuxer.c Sun Apr 24 23:06:38 2011 +0000 @@ -225,9 +225,7 @@ return NULL; } - -demuxer_t *new_demuxer(stream_t *stream, int type, int a_id, int v_id, - int s_id, char *filename) +demuxer_t *alloc_demuxer(stream_t *stream, int type, const char *filename) { demuxer_t *d = calloc(1, sizeof(*d)); d->stream = stream; @@ -238,9 +236,6 @@ d->seekable = 1; d->synced = 0; d->filepos = -1; - d->audio = new_demuxer_stream(d, a_id); - d->video = new_demuxer_stream(d, v_id); - d->sub = new_demuxer_stream(d, s_id); d->type = type; if (type) if (!(d->desc = get_demuxer_desc_from_type(type))) @@ -249,6 +244,16 @@ "big troubles ahead."); if (filename) // Filename hack for avs_check_file d->filename = strdup(filename); + return d; +} + +demuxer_t *new_demuxer(stream_t *stream, int type, int a_id, int v_id, + int s_id, char *filename) +{ + demuxer_t *d = alloc_demuxer(stream, type, filename); + d->audio = new_demuxer_stream(d, a_id); + d->video = new_demuxer_stream(d, v_id); + d->sub = new_demuxer_stream(d, s_id); stream->eof = 0; stream_seek(stream, stream->start_pos); return d;