From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Fri, 30 Mar 2012 15:09:34 +0000 (+0200)
Subject: opusenc: fixup merge
X-Git-Tag: RELEASE-0.11.90~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af14e951c1a84cb2a3178bb714c96af758c1ceb1;p=platform%2Fupstream%2Fgst-plugins-bad.git

opusenc: fixup merge
---

diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c
index 1dfcf48..43301de 100644
--- a/ext/opus/gstopusenc.c
+++ b/ext/opus/gstopusenc.c
@@ -830,8 +830,7 @@ gst_opus_enc_encode (GstOpusEnc * enc, GstBuffer * buf)
 
   outsize =
       opus_multistream_encode (enc->state, (const gint16 *) data,
-      enc->frame_samples, GST_BUFFER_DATA (outbuf),
-      enc->max_payload_size * enc->n_channels);
+      enc->frame_samples, omap.data, enc->max_payload_size * enc->n_channels);
 
   gst_buffer_unmap (outbuf, &omap);
 
@@ -848,7 +847,7 @@ gst_opus_enc_encode (GstOpusEnc * enc, GstBuffer * buf)
   }
 
   GST_DEBUG_OBJECT (enc, "Output packet is %u bytes", outsize);
-  GST_BUFFER_SIZE (outbuf) = outsize;
+  gst_buffer_set_size (outbuf, outsize);
 
   ret =
       gst_audio_encoder_finish_frame (GST_AUDIO_ENCODER (enc), outbuf,