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_memory.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_memory.c')
| -rw-r--r-- | stream/stream_memory.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/stream/stream_memory.c b/stream/stream_memory.c index 0994e0816f..79bfea459d 100644 --- a/stream/stream_memory.c +++ b/stream/stream_memory.c @@ -54,10 +54,8 @@ static int control(stream_t *s, int cmd, void *arg) return STREAM_UNSUPPORTED; } -static int open_f(stream_t *stream, int mode, void* opts, int* file_format) +static int open_f(stream_t *stream, int mode, void* opts) { - stream->type = STREAMTYPE_MEMORY; - stream->fill_buffer = fill_buffer; stream->seek = seek; stream->control = control; @@ -75,10 +73,7 @@ static int open_f(stream_t *stream, int mode, void* opts, int* file_format) } const stream_info_t stream_info_memory = { - "Memory", "memory", - "", - "", open_f, { "memory", NULL }, }; |