Update for API change in flac-1.1.1. Update requirement in configure.ac. Fixes #162974.

Original commit message from CVS:
* configure.ac:
* ext/flac/gstflacenc.c: (gst_flacenc_init),
(gst_flacenc_seek_callback), (gst_flacenc_write_callback),
(gst_flacenc_tell_callback), (gst_flacenc_chain),
(gst_flacenc_change_state):
* ext/flac/gstflacenc.h:
Update for API change in flac-1.1.1. Update requirement in
configure.ac. Fixes #162974.

diff --git a/ChangeLog b/ChangeLog
index 5f2ac00..9ee2738 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2005-01-09  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
+       * configure.ac:
+       * ext/flac/gstflacenc.c: (gst_flacenc_init),
+       (gst_flacenc_seek_callback), (gst_flacenc_write_callback),
+       (gst_flacenc_tell_callback), (gst_flacenc_chain),
+       (gst_flacenc_change_state):
+       * ext/flac/gstflacenc.h:
+         Update for API change in flac-1.1.1. Update requirement in
+         configure.ac. Fixes #162974.
+
+2005-01-09  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
        * gst/playback/gstplaybasebin.c: (group_destroy):
          Remove hack to get rid of assert and get rid of unlinked
          signals properly.

diff --git a/configure.ac b/configure.ac
index 73333ff..4fa04b0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1064,6 +1064,13 @@ dnl *** FLAC ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_FLAC, true)
 GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flacenc flacdec, [
   GST_CHECK_LIBHEADER(FLAC, FLAC, FLAC__seekable_stream_encoder_new, -lm, FLAC/all.h, FLAC_LIBS="-lFLAC")
+  dnl API change in FLAC 1.1.1, so require that...
+  if test x$HAVE_FLAC = xyes; then
+    AC_CHECK_DECL(FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR,
+                  HAVE_FLAC="yes", HAVE_FLAC="no", [
+#include <FLAC/seekable_stream_encoder.h>
+                  ])
+  fi
   AC_SUBST(FLAC_LIBS)
 ])