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_avdevice.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_avdevice.c')
-rw-r--r-- | stream/stream_avdevice.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/stream/stream_avdevice.c b/stream/stream_avdevice.c index e26d5a9060..5d94b35d70 100644 --- a/stream/stream_avdevice.c +++ b/stream/stream_avdevice.c @@ -19,31 +19,26 @@ #include "config.h" #include "stream.h" -#include "demux/demux.h" static int fill_buffer(stream_t *s, char *buffer, int max_len) { return -1; } -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) { if (mode != STREAM_READ) return STREAM_ERROR; stream->fill_buffer = fill_buffer; stream->type = STREAMTYPE_AVDEVICE; + stream->demuxer = "lavf"; - *file_format = DEMUXER_TYPE_LAVF; return STREAM_OK; } const stream_info_t stream_info_avdevice = { - .info = "FFmpeg libavdevice", .name = "avdevice", - .author = "", - .comment = - "Force a libavformat/libavdevice demuxer with avdevice://demuxer:args", .open = open_f, .protocols = { "avdevice", "av", NULL }, }; |