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_cdda.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_cdda.c')
-rw-r--r-- | stream/stream_cdda.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index df7862cd8f..2a8eb7553f 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -383,7 +383,6 @@ static int open_cdda(stream_t *st) st->streaming = true; - st->type = STREAMTYPE_CDDA; st->demuxer = "+disc"; print_cdtext(st, 0); |