diff options
| author | Max Kellermann <max@duempel.org> | 2008-12-27 13:34:51 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-12-27 13:34:51 +0100 |
| commit | 9220e0edfff2428fbbcec60460c5841cbd40eadd (patch) | |
| tree | cc997a53da08b83db7add4a0813d8b2ab80cf8ad /src/input_stream.c | |
| parent | 0e7c67067b11e2db06bfc6a05798559a7e44a25f (diff) | |
| parent | 4674d0442a4edc8647c060fbff2dd5e7ae9e3f84 (diff) | |
| download | mpd-9220e0edfff2428fbbcec60460c5841cbd40eadd.tar.gz mpd-9220e0edfff2428fbbcec60460c5841cbd40eadd.tar.xz mpd-9220e0edfff2428fbbcec60460c5841cbd40eadd.zip | |
Merge branch 'experimental' of git://git.musicpd.org/metyl/mpd
Conflicts:
configure.ac
src/ls.h
src/output/shout_plugin.c
Diffstat (limited to 'src/input_stream.c')
| -rw-r--r-- | src/input_stream.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/input_stream.c b/src/input_stream.c index 65b6a89b2..45b7ec5e9 100644 --- a/src/input_stream.c +++ b/src/input_stream.c @@ -20,6 +20,7 @@ #include "config.h" #include "input_file.h" +#include "input_archive.h" #ifdef HAVE_CURL #include "input_curl.h" @@ -30,6 +31,7 @@ static const struct input_plugin *const input_plugins[] = { &input_plugin_file, + &input_plugin_archive, #ifdef HAVE_CURL &input_plugin_curl, #endif |