mirrors
/
flac
mirror of https://github.com/xiph/flac
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly initialize FLAC_API_SUPPORTS_OGG_FLAC 

Commits a7e3705d05 and
a4c321e492, 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 <erikd@mega-nerd.com>
This commit is contained in:
Ulrich Klauer 2013-05-25 14:14:08 +02:00 committed by Erik de Castro Lopo
parent d2122a0725
commit c9f05ed210
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libFLAC/stream_decoder.c
View File

@ -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
;
/***********************************************************************