diff options
| author | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-11-25 12:48:58 +0100 |
|---|---|---|
| committer | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-11-25 12:48:58 +0100 |
| commit | b78b980d7236d03378450ac89452dc4ec537824c (patch) | |
| tree | 1a4bbff76ac8020b99f3321afa73eebbb4e9006d /ext/faac | |
| parent | c41b5d016cbbe8dc6fa99a377b169e96d24238a9 (diff) | |
| parent | cdcc39455cc92ba5e6988056b03ac9c350a9bb6a (diff) | |
| download | gstreamer-plugins-bad-b78b980d7236d03378450ac89452dc4ec537824c.tar.gz | |
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
ext/faac/gstfaac.c
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c
gst/audiovisualizers/gstspacescope.c
gst/colorspace/colorspace.c
Diffstat (limited to 'ext/faac')
| -rw-r--r-- | ext/faac/gstfaac.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c index 15107d93b..ddfae6d52 100644 --- a/ext/faac/gstfaac.c +++ b/ext/faac/gstfaac.c @@ -672,6 +672,7 @@ gst_faac_handle_frame (GstAudioEncoder * enc, GstBuffer * in_buf) /* ERRORS */ encode_failed: { + gst_buffer_unref (out_buf); GST_ELEMENT_ERROR (faac, LIBRARY, ENCODE, (NULL), (NULL)); gst_buffer_unmap (in_buf, data, size); gst_buffer_unmap (out_buf, out_data, 0); |