diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-10 13:15:12 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-10 13:15:12 +0100 |
| commit | dc8984d76ca6a84625f22b728e12396698f257a4 (patch) | |
| tree | 430af44583a0f4a8ebdf4c8b12083800747a3e8d /gst/audiotestsrc | |
| parent | ed53219e49eb6f5b2d92abb3136c41b9653c0190 (diff) | |
| parent | e8fd3056233d28d4301fc2b92882fed31ae0e68a (diff) | |
| download | gstreamer-plugins-base-dc8984d76ca6a84625f22b728e12396698f257a4.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
gst-libs/gst/app/gstappsrc.c
gst-libs/gst/audio/multichannel.h
gst-libs/gst/video/videooverlay.c
gst/playback/gstplaysink.c
gst/playback/gststreamsynchronizer.c
tests/check/Makefile.am
win32/common/libgstvideo.def
Diffstat (limited to 'gst/audiotestsrc')
| -rw-r--r-- | gst/audiotestsrc/gstaudiotestsrc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gst/audiotestsrc/gstaudiotestsrc.c b/gst/audiotestsrc/gstaudiotestsrc.c index 558854032..1a900bed4 100644 --- a/gst/audiotestsrc/gstaudiotestsrc.c +++ b/gst/audiotestsrc/gstaudiotestsrc.c @@ -1128,6 +1128,8 @@ gst_audio_test_src_fill (GstBaseSrc * basesrc, guint64 offset, if (eclass->send_event) eclass->send_event (GST_ELEMENT_CAST (basesrc), gst_event_new_tag (taglist)); + else + gst_tag_list_free (taglist); src->tags_pushed = TRUE; } |