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_mf.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_mf.c')
| -rw-r--r-- | stream/stream_mf.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/stream/stream_mf.c b/stream/stream_mf.c index 9b8b47188a..9f87dad6b1 100644 --- a/stream/stream_mf.c +++ b/stream/stream_mf.c @@ -2,6 +2,7 @@ * stream layer for multiple files input, based on previous work from Albeu * * Copyright (C) 2006 Benjamin Zores + * Original author: Albeu * * This file is part of MPlayer. * @@ -26,22 +27,18 @@ #include <string.h> #include "stream.h" -#include "demux/demux.h" static int -mf_stream_open (stream_t *stream, int mode, void *opts, int *file_format) +mf_stream_open (stream_t *stream, int mode, void *opts) { stream->type = STREAMTYPE_MF; - *file_format = DEMUXER_TYPE_MF; + stream->demuxer = "mf"; return STREAM_OK; } const stream_info_t stream_info_mf = { - "Multiple files input", "mf", - "Benjamin Zores, Albeu", - "", mf_stream_open, { "mf", NULL }, NULL, |