diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ext/flac/gstflacdec.c | 20 |
2 files changed, 14 insertions, 15 deletions
@@ -1,5 +1,14 @@ 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. diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c index 33af0da7..fe78c774 100644 --- a/ext/flac/gstflacdec.c +++ b/ext/flac/gstflacdec.c @@ -300,11 +300,6 @@ gst_flac_dec_setup_seekable_decoder (GstFlacDec * dec) 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_setup_stream_decoder (GstFlacDec * dec) 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 @@ gst_flac_dec_scan_for_last_block (GstFlacDec * flacdec, gint64 * samples) } } -/* 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_flac_extract_picture_buffer (GstFlacDec * flacdec, 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 @@ 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; |