Index: ext/flac/gstflacdec.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/ext/flac/gstflacdec.c,v
retrieving revision 1.89
diff -u -r1.89 gstflacdec.c
--- ext/flac/gstflacdec.c	17 Jan 2008 21:23:32 -0000	1.89
+++ ext/flac/gstflacdec.c	1 Feb 2008 07:03:33 -0000
@@ -300,11 +300,6 @@
       gst_flac_dec_write_seekable);
   FLAC__seekable_stream_decoder_set_metadata_respond (dec->seekable_decoder,
       FLAC__METADATA_TYPE_VORBIS_COMMENT);
-/* FIXME: remove ifdef once we depend on flac >= 1.2.x */
-#ifdef FLAC__METADATA_TYPE_PICTURE
-  FLAC__seekable_stream_decoder_set_metadata_respond (dec->seekable_decoder,
-      FLAC__METADATA_TYPE_PICTURE);
-#endif
   FLAC__seekable_stream_decoder_set_metadata_callback (dec->seekable_decoder,
       gst_flac_dec_metadata_callback_seekable);
   FLAC__seekable_stream_decoder_set_error_callback (dec->seekable_decoder,
@@ -336,11 +331,6 @@
       gst_flac_dec_write_stream);
   FLAC__stream_decoder_set_metadata_respond (dec->stream_decoder,
       FLAC__METADATA_TYPE_VORBIS_COMMENT);
-/* FIXME: remove ifdef once we depend on flac >= 1.2.x */
-#ifdef FLAC__METADATA_TYPE_PICTURE
-  FLAC__stream_decoder_set_metadata_respond (dec->stream_decoder,
-      FLAC__METADATA_TYPE_PICTURE);
-#endif
   FLAC__stream_decoder_set_metadata_callback (dec->stream_decoder,
       gst_flac_dec_metadata_callback_stream);
   FLAC__stream_decoder_set_error_callback (dec->stream_decoder,
@@ -579,8 +569,8 @@
   }
 }
 
-/* FIXME: remove ifdef once we depend on flac >= 1.2.x */
-#ifdef FLAC__METADATA_TYPE_PICTURE
+/* FIXME: remove ifndef once we depend on flac >= 1.2.x */
+#ifndef LEGACY_FLAC
 static gchar *
 gst_flac_normalize_picture_mime_type (const gchar * old_mime_type,
     gboolean * is_pic_uri)
@@ -703,7 +693,7 @@
     GST_DEBUG ("problem parsing PICTURE block, skipping");
   }
 }
-#endif /* FLAC__METADATA_TYPE_PICTURE */
+#endif /* LEGACY_FLAC */
 
 static void
 gst_flac_dec_metadata_callback (GstFlacDec * flacdec,
@@ -751,8 +741,8 @@
       break;
     }
 
-/* FIXME: remove ifdef once we depend on flac >= 1.2.x */
-#ifdef FLAC__METADATA_TYPE_PICTURE
+/* FIXME: remove ifndef once we depend on flac >= 1.2.x */
+#ifndef LEGACY_FLAC
     case FLAC__METADATA_TYPE_PICTURE:{
       gst_flac_extract_picture_buffer (flacdec, metadata);
       break;
