diff options
author | Max Kellermann <max@duempel.org> | 2011-01-07 23:52:23 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2011-01-07 23:52:23 +0100 |
commit | 1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788 (patch) | |
tree | 8a13ed86728b59caebd86dc7a1287c234b4985f1 /src/audio_check.h | |
parent | a800afcbf8845df0edc6aee3bb48036bba34e255 (diff) | |
parent | 8c0afd8557b1823e2df94c9f4de90c29eafbf035 (diff) | |
download | mpd-1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788.tar.gz mpd-1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788.tar.xz mpd-1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788.zip |
Merge branch 'v0.16.x'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'src/audio_check.h')
-rw-r--r-- | src/audio_check.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/audio_check.h b/src/audio_check.h index cc08c9ba1..4862e7f15 100644 --- a/src/audio_check.h +++ b/src/audio_check.h @@ -38,7 +38,7 @@ bool audio_check_sample_rate(unsigned long sample_rate, GError **error_r); bool -audio_check_sample_format(unsigned sample_format, GError **error_r); +audio_check_sample_format(enum sample_format, GError **error_r); bool audio_check_channel_count(unsigned sample_format, GError **error_r); |