diff options
author | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
commit | e18ffd6b998858ca0797cb0ce4aabd4a509655dd (patch) | |
tree | 199bddd30923db1175a1331191eb86ba684e9e41 /stream/stream_dvd.c | |
parent | 3e7d483ac89289f613138002be2043ec5f479bb0 (diff) | |
parent | 5ead20bdb3328d199dad693039d18e7a05eb2465 (diff) | |
download | mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.bz2 mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.xz |
Merge branch 'remove_old_demuxers'
The merged branch doesn't actually just remove old demuxers, but also
includes a branch of cleanups and some refactoring.
Conflicts:
stream/stream.c
Diffstat (limited to 'stream/stream_dvd.c')
-rw-r--r-- | stream/stream_dvd.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index bf9cb9d4c7..565054d81b 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -1,6 +1,8 @@ /* * This file is part of MPlayer. * + * Original author: Benjamin Zores + * * MPlayer is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -745,7 +747,8 @@ static int control(stream_t *stream,int cmd,void* arg) } -static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { +static int open_s(stream_t *stream,int mode, void* opts) +{ struct stream_priv_s* p = (struct stream_priv_s*)opts; int k; @@ -1059,7 +1062,7 @@ fail: return STREAM_UNSUPPORTED; } -static int ifo_stream_open (stream_t *stream, int mode, void *opts, int *file_format) +static int ifo_stream_open (stream_t *stream, int mode, void *opts) { char* filename; struct stream_priv_s *spriv; @@ -1085,14 +1088,11 @@ static int ifo_stream_open (stream_t *stream, int mode, void *opts, int *file_fo free(stream->url); stream->url=strdup("dvd://"); - return open_s(stream, mode, spriv, file_format); + return open_s(stream, mode, spriv); } const stream_info_t stream_info_dvd = { - "DVD stream", - "null", - "", - "", + "dvd", open_s, { "dvd", NULL }, &stream_opts, @@ -1100,10 +1100,7 @@ const stream_info_t stream_info_dvd = { }; const stream_info_t stream_info_ifo = { - "DVD IFO input", "ifo", - "Benjamin Zores", - "Mostly used to play DVDs on disk through OSD Menu", ifo_stream_open, { "file", "", NULL }, NULL, |