Commit c9f05ed2 authored by Ulrich Klauer's avatar Ulrich Klauer Committed by Erik de Castro Lopo
Browse files

Correctly initialize FLAC_API_SUPPORTS_OGG_FLAC

Commits a7e3705d and
a4c321e4

, while trying to simplify how
the FLAC_API_SUPPORTS_OGG_FLAC global variable was initialized,
inadvertently caused it to be always set to false, whether Ogg support
was compiled in or not.

This commit reverts the relevant part to how it looked in the 1.2.1
release, which is verbose but correct.

The problem was found by Robert Kausch <robert.kausch@freac.org>.
Signed-off-by: Erik de Castro Lopo's avatarErik de Castro Lopo <erikd@mega-nerd.com>
parent d2122a07
......@@ -55,11 +55,13 @@
/* technically this should be in an "export.c" but this is convenient enough */
#ifdef FLAC_API_SUPPORTS_OGG_FLAC
FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC = FLAC__HAS_OGG ;
FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC =
#if FLAC__HAS_OGG
1
#else
FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC = 0 ;
0
#endif
;
/***********************************************************************
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment