diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-23 11:08:39 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-23 11:08:39 +0100 |
| commit | 0a9387c43cffab2c357d79a64b02c1058b7cee89 (patch) | |
| tree | 8cb09e4a9b5bdae8ffb8d4df3394920e132c3aa4 /ext/celt | |
| parent | e813abf631ac9cddd94f0137d2d717cf551fe4c9 (diff) | |
| parent | e3d1a50c0d2a30558e3a46d9ba74d27f153cc670 (diff) | |
| download | gstreamer-plugins-bad-0a9387c43cffab2c357d79a64b02c1058b7cee89.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c
ext/opus/gstopusparse.c
gst/audiovisualizers/gstwavescope.c
gst/filter/Makefile.am
gst/filter/gstfilter.c
gst/filter/gstiir.c
gst/playondemand/gstplayondemand.c
Diffstat (limited to 'ext/celt')
| -rw-r--r-- | ext/celt/gstceltdec.h | 2 | ||||
| -rw-r--r-- | ext/celt/gstceltenc.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ext/celt/gstceltdec.h b/ext/celt/gstceltdec.h index 9baf719d9..12f2c5465 100644 --- a/ext/celt/gstceltdec.h +++ b/ext/celt/gstceltdec.h @@ -52,8 +52,6 @@ struct _GstCeltDec { gint frame_size; guint64 packetno; - gboolean discont; - GstBuffer *streamheader; GstBuffer *vorbiscomment; GList *extra_headers; diff --git a/ext/celt/gstceltenc.c b/ext/celt/gstceltenc.c index 37366a2a5..19c8b9ff3 100644 --- a/ext/celt/gstceltenc.c +++ b/ext/celt/gstceltenc.c @@ -501,7 +501,8 @@ gst_celt_enc_encode (GstCeltEnc * enc, GstBuffer * buf) #endif if (outsize < 0) { - GST_ERROR_OBJECT (enc, "Encoding failed: %d", outsize); + GST_ELEMENT_ERROR (enc, STREAM, ENCODE, (NULL), + ("encoding failed: %d", outsize)); ret = GST_FLOW_ERROR; goto done; } |