From 7329c15d6f194cda7d1f1ce0e40e57ed301a1b7e Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 20 Feb 2010 17:50:56 +0000 Subject: Print demuxer name in "freeing demuxer" message. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30666 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmpdemux/demuxer.c') diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index d30b11f97e..a525f9af13 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -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 -- cgit v1.2.3 From 9554a844e9daef9a702004957f0d74aabacd8403 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 20 Feb 2010 18:53:07 +0000 Subject: Do not discard stream buffer on eof, instead reuse it to slightly improve format autodetection with -nocache and non-seekable streams. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30668 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpdemux/demuxer.c') diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index a525f9af13..86d36d95ee 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -247,7 +247,7 @@ demuxer_t *new_demuxer(stream_t *stream, int type, int a_id, int v_id, "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; } -- cgit v1.2.3