diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-17 17:17:11 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-17 17:17:11 +0100 |
| commit | 07cc855b242e8ff757786bd2320f4db74e99cdfa (patch) | |
| tree | 69da7fbaaab21d5ec37f9113bae0e05f89ae8969 /ext/flac/gstflacenc.c | |
| parent | 105650127e90982d96dd50971adcf90971a945d2 (diff) | |
| parent | 7df81223220600b7e27f1fdc1be25891dc63bdba (diff) | |
| download | gstreamer-plugins-good-07cc855b242e8ff757786bd2320f4db74e99cdfa.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
ext/speex/gstspeexenc.c
gst/rtpmanager/rtpsession.c
Diffstat (limited to 'ext/flac/gstflacenc.c')
| -rw-r--r-- | ext/flac/gstflacenc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c index 1ab39d7df..989ce4c52 100644 --- a/ext/flac/gstflacenc.c +++ b/ext/flac/gstflacenc.c @@ -462,6 +462,8 @@ gst_flac_enc_stop (GstAudioEncoder * enc) g_list_free (flacenc->headers); flacenc->headers = NULL; + gst_tag_setter_reset_tags (GST_TAG_SETTER (enc)); + return TRUE; } |