diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:56:01 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:56:01 +0300 |
| commit | a2037a2effbd4622d0e8336245a9b14c3f886bde (patch) | |
| tree | bd2face6dd36d2663197b23a33da9e9b2814f70c /mplayer.c | |
| parent | 0c2773a709276681575d2507aa60ee85c2d0b850 (diff) | |
| parent | 43079c51daa8c12b0a44e5ad8022c979dd9e8336 (diff) | |
| download | mpv-a2037a2effbd4622d0e8336245a9b14c3f886bde.tar.bz2 mpv-a2037a2effbd4622d0e8336245a9b14c3f886bde.tar.xz | |
Merge svn changes up to r29412
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -460,7 +460,7 @@ static char *get_demuxer_info(struct MPContext *mpctx, char *tag) { return NULL; for (n = 0; info[2*n] != NULL ; n++) - if (!strcmp (info[2*n], tag)) + if (!strcasecmp (info[2*n], tag)) break; return info[2*n+1] ? strdup (info[2*n+1]) : NULL; @@ -3941,7 +3941,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); |