diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
| commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
| tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /stream/stream_bluray.c | |
| parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
| parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
| download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'stream/stream_bluray.c')
| -rw-r--r-- | stream/stream_bluray.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c index 5f083954c2..07dcc7f69e 100644 --- a/stream/stream_bluray.c +++ b/stream/stream_bluray.c @@ -425,7 +425,7 @@ static int bluray_stream_open_internal(stream_t *s) char *time = mp_format_time(ti->duration / 90000, false); MP_VERBOSE(s, "idx: %3d duration: %s (playlist: %05d.mpls)\n", - i + 1, time, ti->playlist); + i, time, ti->playlist); talloc_free(time); /* try to guess which title may contain the main movie */ @@ -450,7 +450,6 @@ static int bluray_stream_open_internal(stream_t *s) s->fill_buffer = bluray_stream_fill_buffer; s->close = bluray_stream_close; s->control = bluray_stream_control; - s->type = STREAMTYPE_BLURAY; s->sector_size = BLURAY_SECTOR_SIZE; s->priv = b; s->demuxer = "+disc"; |