diff options
| author | Max Kellermann <max@duempel.org> | 2013-06-24 16:17:46 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-06-24 16:17:46 +0200 |
| commit | ef48eca9cac875f65622daf500bd702e20d666f3 (patch) | |
| tree | 52fe455c347fd0f0ab14b471e2482c17c8aed5e6 /src/decoder/FlacCommon.hxx | |
| parent | 906d2fbadf075b7d8e3a5be7134a9bebb09b7285 (diff) | |
| parent | e9e55b08127dc45b4c6045e1f42e34115086a521 (diff) | |
| download | mpd-ef48eca9cac875f65622daf500bd702e20d666f3.tar.gz mpd-ef48eca9cac875f65622daf500bd702e20d666f3.tar.xz mpd-ef48eca9cac875f65622daf500bd702e20d666f3.zip | |
Merge branch 'master' of git://git.musicpd.org/dk/mpd
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/FlacCommon.hxx (renamed from src/decoder/FLACCommon.hxx) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/decoder/FLACCommon.hxx b/src/decoder/FlacCommon.hxx index 20f93c8c7..0cd295e0d 100644 --- a/src/decoder/FLACCommon.hxx +++ b/src/decoder/FlacCommon.hxx @@ -24,7 +24,7 @@ #ifndef MPD_FLAC_COMMON_HXX #define MPD_FLAC_COMMON_HXX -#include "FLACInput.hxx" +#include "FlacInput.hxx" #include "decoder_api.h" extern "C" { @@ -37,7 +37,7 @@ extern "C" { #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "flac" -struct flac_data : public FLACInput { +struct flac_data : public FlacInput { struct pcm_buffer buffer; /** |