summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2005-05-18 21:47:39 +0000
committerDavid Schleef <ds@schleef.org>2005-05-18 21:47:39 +0000
commit4f5720b19af4529e08f54736b176ede8096e03d5 (patch)
tree45c2ad934ce9776cd8616b8a07464c881668b729
parent3d2197a352aae661535e4f214734c1ef8c137a54 (diff)
downloadgst-plugins-bad-4f5720b19af4529e08f54736b176ede8096e03d5.tar.gz
gst-plugins-bad-4f5720b19af4529e08f54736b176ede8096e03d5.tar.bz2
gst-plugins-bad-4f5720b19af4529e08f54736b176ede8096e03d5.zip
ext/swfdec/gstswfdec.c: Disable last patch, because it depends on swfdec CVS. (oops)
Original commit message from CVS: * ext/swfdec/gstswfdec.c: (gst_swfdec_loop): Disable last patch, because it depends on swfdec CVS. (oops)
-rw-r--r--ChangeLog5
-rw-r--r--ext/swfdec/gstswfdec.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ce7e6bd..5ae104ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-18 David Schleef <ds@schleef.org>
+
+ * ext/swfdec/gstswfdec.c: (gst_swfdec_loop): Disable last
+ patch, because it depends on swfdec CVS. (oops)
+
2005-05-18 Lutz Mueller <lutz@users.sourceforge.net>
Reviewed and modified by: Luca Ognibene <luogni@tin.it>
diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c
index f2d63744..927df0ad 100644
--- a/ext/swfdec/gstswfdec.c
+++ b/ext/swfdec/gstswfdec.c
@@ -264,7 +264,11 @@ gst_swfdec_loop (GstElement * element)
} else if (ret == SWF_CHANGE) {
GstCaps *caps;
GstPadLinkReturn link_ret;
+
+/* Let's not depend on features that are only in CVS */
+#ifdef HAVE_SWFDEC_0_3_5
GstTagList *taglist;
+#endif
swfdec_decoder_get_image_size (swfdec->decoder,
&swfdec->width, &swfdec->height);
@@ -286,12 +290,14 @@ gst_swfdec_loop (GstElement * element)
}
swfdec->have_format = TRUE;
+#ifdef HAVE_SWFDEC_0_3_5
taglist = gst_tag_list_new ();
gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE,
GST_TAG_ENCODER_VERSION, swfdec_decoder_get_version (swfdec->decoder),
NULL);
gst_element_found_tags (GST_ELEMENT (swfdec), taglist);
gst_tag_list_free (taglist);
+#endif
} else if (ret == SWF_EOF) {
SwfdecBuffer *audio_buffer;
SwfdecBuffer *video_buffer;