summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2005-05-17 07:21:18 +0000
committerDavid Schleef <ds@schleef.org>2005-05-17 07:21:18 +0000
commit95ea1fbb1f18d3b55412db44f07a4f09aa14195b (patch)
treefc7a0efe873803d075fc89b9d22160ae8c837b4a
parent9bc18a9a15e8ea20bf3fde066294b2866b751f6f (diff)
downloadgst-plugins-bad-95ea1fbb1f18d3b55412db44f07a4f09aa14195b.tar.gz
gst-plugins-bad-95ea1fbb1f18d3b55412db44f07a4f09aa14195b.tar.bz2
gst-plugins-bad-95ea1fbb1f18d3b55412db44f07a4f09aa14195b.zip
ext/swfdec/gstswfdec.c: Create a tag indicating the version of SWF file. (Used by swfdec-mozilla-plugin.)
Original commit message from CVS: * ext/swfdec/gstswfdec.c: Create a tag indicating the version of SWF file. (Used by swfdec-mozilla-plugin.)
-rw-r--r--ChangeLog5
-rw-r--r--ext/swfdec/gstswfdec.c10
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a4ff495b..cd83490d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-05-17 David Schleef <ds@schleef.org>
+ * ext/swfdec/gstswfdec.c: Create a tag indicating the version
+ of SWF file. (Used by swfdec-mozilla-plugin.)
+
+2005-05-17 David Schleef <ds@schleef.org>
+
* gst/librfb/Makefile.am:
* gst/librfb/gstrfbsrc.c:
* gst/librfb/rfb.h:
diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c
index 883a1052..f2d63744 100644
--- a/ext/swfdec/gstswfdec.c
+++ b/ext/swfdec/gstswfdec.c
@@ -264,6 +264,7 @@ gst_swfdec_loop (GstElement * element)
} else if (ret == SWF_CHANGE) {
GstCaps *caps;
GstPadLinkReturn link_ret;
+ GstTagList *taglist;
swfdec_decoder_get_image_size (swfdec->decoder,
&swfdec->width, &swfdec->height);
@@ -284,6 +285,13 @@ gst_swfdec_loop (GstElement * element)
return;
}
swfdec->have_format = TRUE;
+
+ 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);
} else if (ret == SWF_EOF) {
SwfdecBuffer *audio_buffer;
SwfdecBuffer *video_buffer;
@@ -664,7 +672,7 @@ gst_swfdec_get_property (GObject * object, guint prop_id, GValue * value,
void
art_warn (const char *fmt, ...)
{
- GST_ERROR ("caught art_warn");
+ GST_LOG ("caught art_warn");
}
static gboolean