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.h | |
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 '')
-rw-r--r-- | src/input_stream.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/input_stream.h b/src/input_stream.h index c8d8068d3..7ed0039a3 100644 --- a/src/input_stream.h +++ b/src/input_stream.h @@ -48,6 +48,8 @@ struct input_stream { void *data; char *meta_name; char *meta_title; + + void *archive; }; void input_stream_global_init(void); |