[MPlayer-cvslog] r29331 - trunk/mplayer.c

[reimar]

Author: reimar
Date: Sun May 31 14:48:53 2009
New Revision: 29331

Log:
Make ID_SEEKABLE depend on both the stream and the demuxer being seekable,
instead of only depending on the stream.
This makes the value correctly 0 e.g. for AVI files without index.
Patch by Jason Tackaberry [tack urandom ca]

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Sat May 30 15:18:57 2009	(r29330)
+++ trunk/mplayer.c	Sun May 31 14:48:53 2009	(r29331)
@@ -3492,7 +3492,8 @@ if (mpctx->global_sub_size) {
     mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_AUDIO_NCH=%d\n", mpctx->sh_audio->channels);
   }
   mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_LENGTH=%.2lf\n", demuxer_get_time_length(mpctx->demuxer));
-  mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_SEEKABLE=%d\n", mpctx->stream->seek ? 1 : 0);
+  mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_SEEKABLE=%d\n",
+         mpctx->stream->seek && (!mpctx->demuxer || mpctx->demuxer->seekable));
   if (mpctx->demuxer) {
       if (mpctx->demuxer->num_chapters == 0)
           stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, &mpctx->demuxer->num_chapters);