From d1e7b4e38136f9342aad76c685a13adf0e69f869 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 3 Aug 2013 21:00:50 +0200 Subject: audio_format: convert to C++ --- src/decoder/FfmpegMetaData.hxx | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/decoder/FfmpegMetaData.hxx') diff --git a/src/decoder/FfmpegMetaData.hxx b/src/decoder/FfmpegMetaData.hxx index 466d2cb1d..0fd73df04 100644 --- a/src/decoder/FfmpegMetaData.hxx +++ b/src/decoder/FfmpegMetaData.hxx @@ -26,6 +26,11 @@ extern "C" { #include } +/* suppress the ffmpeg compatibility macro */ +#ifdef SampleFormat +#undef SampleFormat +#endif + struct tag_handler; void -- cgit v1.2.3