From af14e951c1a84cb2a3178bb714c96af758c1ceb1 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Fri, 30 Mar 2012 17:09:34 +0200 Subject: [PATCH] opusenc: fixup merge --- ext/opus/gstopusenc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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, -- 2.7.4