diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-09 12:19:04 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-09 12:19:04 +0100 |
| commit | dbdaa23742d5b934fa424c056547f0e179248f2c (patch) | |
| tree | 519b8c2b5704e2de2ac3a32dfdeaabf27eba1ef8 /ext/celt | |
| parent | 0d0444e0fa2c78ea12d3034bb8fa69c2c402895f (diff) | |
| parent | 8529526c54441a40dce4a616acf43fb9cef51400 (diff) | |
| download | gstreamer-plugins-bad-dbdaa23742d5b934fa424c056547f0e179248f2c.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
gst/colorspace/colorspace.c
Diffstat (limited to 'ext/celt')
| -rw-r--r-- | ext/celt/gstceltenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/celt/gstceltenc.c b/ext/celt/gstceltenc.c index 9e6944df0..c2011b31c 100644 --- a/ext/celt/gstceltenc.c +++ b/ext/celt/gstceltenc.c @@ -494,7 +494,7 @@ gst_celt_enc_src_query (GstPad * pad, GstQuery * query) GstClockTime min_latency, max_latency; gint64 latency; - if ((res = gst_pad_peer_query (pad, query))) { + if ((res = gst_pad_peer_query (enc->sinkpad, query))) { gst_query_parse_latency (query, &live, &min_latency, &max_latency); latency = gst_celt_enc_get_latency (enc); @@ -820,7 +820,7 @@ gst_celt_enc_encode (GstCeltEnc * enc, gboolean flush) } if (flush && gst_adapter_available (enc->adapter) % bytes != 0) { - guint diff = gst_adapter_available (enc->adapter) % bytes; + guint diff = bytes - gst_adapter_available (enc->adapter) % bytes; GstBuffer *buf = gst_buffer_new_and_alloc (diff); memset (GST_BUFFER_DATA (buf), 0, diff); |