diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-22 11:53:24 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-22 11:53:24 +0100 |
| commit | c44cd8f55bc0bf409e86b039cad0e2f757d5c77e (patch) | |
| tree | fee1a36e4d8d8b533b6e5f0c811e4449f9d5f351 /ext/speex | |
| parent | 3e8ae7603ccbef3db071f8798a1d3809f40f8639 (diff) | |
| parent | 440d7034f09de014f96ec183cd59e2b43bcf75c7 (diff) | |
| download | gstreamer-plugins-good-c44cd8f55bc0bf409e86b039cad0e2f757d5c77e.tar.gz | |
Merge branch 'master' into 0.11
unport gdkpixbuf
not merged: https://bugzilla.gnome.org/show_bug.cgi?id=654850
Conflicts:
docs/plugins/Makefile.am
docs/plugins/gst-plugins-good-plugins-docs.sgml
docs/plugins/gst-plugins-good-plugins-sections.txt
docs/plugins/gst-plugins-good-plugins.hierarchy
docs/plugins/inspect/plugin-avi.xml
docs/plugins/inspect/plugin-png.xml
ext/flac/gstflacdec.c
ext/flac/gstflacdec.h
ext/libpng/gstpngdec.c
ext/libpng/gstpngenc.c
ext/speex/gstspeexdec.c
gst/audioparsers/gstflacparse.c
gst/flv/gstflvmux.c
gst/rtp/gstrtpdvdepay.c
gst/rtp/gstrtph264depay.c
Diffstat (limited to 'ext/speex')
| -rw-r--r-- | ext/speex/gstspeexdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/speex/gstspeexdec.c b/ext/speex/gstspeexdec.c index 6032341cc..7027d20dd 100644 --- a/ext/speex/gstspeexdec.c +++ b/ext/speex/gstspeexdec.c @@ -310,8 +310,9 @@ gst_speex_dec_parse_comments (GstSpeexDec * dec, GstBuffer * buf) GST_INFO_OBJECT (dec, "tags: %" GST_PTR_FORMAT, list); - gst_pad_push_event (GST_AUDIO_DECODER_SRC_PAD (dec), - gst_event_new_tag (list)); + gst_audio_decoder_merge_tags (GST_AUDIO_DECODER (dec), list, + GST_TAG_MERGE_REPLACE); + gst_tag_list_free (list); g_free (encoder); g_free (ver); |