summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 00:34:16 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 00:34:16 +0200
commit327463be525b12e3d00d5fa0e8e15d5000fcd27b (patch)
tree37db96b1a1b4b1b941706e4e4c4dcdec9cbd4ed2 /libmpdemux/demuxer.c
parent7e90be7093daa79fc26dedac6cfb90e87c8acaff (diff)
parent88a8591bc6ae6b9fdbf293ac75967cb9e21f4875 (diff)
downloadmpv-327463be525b12e3d00d5fa0e8e15d5000fcd27b.tar.bz2
mpv-327463be525b12e3d00d5fa0e8e15d5000fcd27b.tar.xz
Merge svn changes up to r30672
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 5ec705af32..589cdeeb37 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -246,7 +246,7 @@ demuxer_t *new_demuxer(struct MPOpts *opts, stream_t *stream, int type,
"big troubles ahead.");
if (filename) // Filename hack for avs_check_file
d->filename = strdup(filename);
- stream_reset(stream);
+ stream->eof = 0;
stream_seek(stream, stream->start_pos);
return d;
}
@@ -366,8 +366,8 @@ void free_sh_video(sh_video_t *sh)
void free_demuxer(demuxer_t *demuxer)
{
int i;
- mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing demuxer at %p\n",
- demuxer);
+ mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing %s demuxer at %p\n",
+ demuxer->desc->shortdesc, demuxer);
if (demuxer->desc->close)
demuxer->desc->close(demuxer);
// Very ugly hack to make it behave like old implementation