diff options
| author | Max Kellermann <max@duempel.org> | 2009-10-31 18:23:56 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-10-31 18:23:56 +0100 |
| commit | 806496dfc937d9b55e00672d42928a25cfa67c90 (patch) | |
| tree | 1a340ce9afe9fa763c83943e7f68cc5b8f3ec750 /src/decoder | |
| parent | 9eadb517da965b01929bdb7ce5c8f2911a9363db (diff) | |
| parent | 3de912e2b956821782bd77acc6e12f66086c1926 (diff) | |
| download | mpd-806496dfc937d9b55e00672d42928a25cfa67c90.tar.gz mpd-806496dfc937d9b55e00672d42928a25cfa67c90.tar.xz mpd-806496dfc937d9b55e00672d42928a25cfa67c90.zip | |
Merge branch 'v0.15.x'
Conflicts:
NEWS
configure.ac
src/decoder/ffmpeg_plugin.c
src/update.c
Diffstat (limited to '')
| -rw-r--r-- | src/decoder_control.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/decoder_control.h b/src/decoder_control.h index 6b65da2f2..cab6c69c7 100644 --- a/src/decoder_control.h +++ b/src/decoder_control.h @@ -27,9 +27,6 @@ #include <assert.h> -#define DECODE_TYPE_FILE 0 -#define DECODE_TYPE_URL 1 - enum decoder_state { DECODE_STATE_STOP = 0, DECODE_STATE_START, |