2008-02-02 Tim-Philipp Müller <tim at centricular dot net>
+ Patch by: John Millikin <jmillikin at gmail dot com>
+
+ * ext/flac/gstflacdec.c: (gst_flac_dec_scan_for_last_block),
+ (gst_flac_extract_picture_buffer), (gst_flac_dec_metadata_callback):
+ Fix extraction of picture blocks with newer libflac versions again:
+ FLAC__METADATA_TYPE_PICTURE is an enum, not a define (#513628).
+
+2008-02-02 Tim-Philipp Müller <tim at centricular dot net>
+
* tests/check/Makefile.am:
Add rtp-payloading test to VALGRIND_TO_FIX.
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,
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,
}
}
-/* 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)
GST_DEBUG ("problem parsing PICTURE block, skipping");
}
}
-#endif /* FLAC__METADATA_TYPE_PICTURE */
+#endif /* LEGACY_FLAC */
static void
gst_flac_dec_metadata_callback (GstFlacDec * flacdec,
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;