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_null.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_null.c')
| -rw-r--r-- | stream/stream_null.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/stream/stream_null.c b/stream/stream_null.c index 5465702be8..8bae12ff9d 100644 --- a/stream/stream_null.c +++ b/stream/stream_null.c @@ -1,6 +1,8 @@ /* * This file is part of MPlayer. * + * Original author: Albeu + * * 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 @@ -23,18 +25,14 @@ #include "stream.h" -static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { - stream->type = STREAMTYPE_DUMMY; - +static int open_s(stream_t *stream,int mode, void* opts) +{ return 1; } const stream_info_t stream_info_null = { - "Null stream", "null", - "Albeu", - "", open_s, { "null", NULL }, NULL, |