From 51acb023423e8db0e82c179290225309a1afc2c8 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Wed, 9 Mar 2011 12:17:18 +0100
Subject: [PATCH] baseaudioencoder: minor fix and cleanup

---
 gst-libs/gst/audio/gstbaseaudioencoder.c |  1 +
 gst-libs/gst/audio/gstbaseaudioencoder.h | 11 -----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/gst-libs/gst/audio/gstbaseaudioencoder.c b/gst-libs/gst/audio/gstbaseaudioencoder.c
index b6b6c1f103..24f151c192 100644
--- a/gst-libs/gst/audio/gstbaseaudioencoder.c
+++ b/gst-libs/gst/audio/gstbaseaudioencoder.c
@@ -553,6 +553,7 @@ gst_base_audio_encoder_finish_frame (GstBaseAudioEncoder * enc, GstBuffer * buf,
   if (av) {
     GST_LOG_OBJECT (enc, "collecting all %d bytes for output", av);
     buf = gst_adapter_take_buffer (priv->adapter_out, av);
+    buf = gst_buffer_make_metadata_writable (buf);
 
     /* decorate */
     gst_buffer_set_caps (buf, GST_PAD_CAPS (enc->srcpad));
diff --git a/gst-libs/gst/audio/gstbaseaudioencoder.h b/gst-libs/gst/audio/gstbaseaudioencoder.h
index 457a2e5691..ffeeb9cd7a 100644
--- a/gst-libs/gst/audio/gstbaseaudioencoder.h
+++ b/gst-libs/gst/audio/gstbaseaudioencoder.h
@@ -79,17 +79,6 @@ G_BEGIN_DECLS
  */
 #define GST_BASE_AUDIO_ENCODER_SEGMENT(obj)     (GST_BASE_AUDIO_ENCODER_CAST (obj)->segment)
 
-/**
- * GST_BASE_AUDIO_ENCODER_FLOW_DROPPED:
- *
- * A #GstFlowReturn that can be returned from parse_frame to
- * indicate that no output buffer was generated, or from pre_push_buffer to
- * to forego pushing buffer.
- *
- * Since: 0.10.x
- */
-#define GST_BASE_AUDIO_ENCODER_FLOW_DROPPED     GST_FLOW_CUSTOM_SUCCESS
-
 
 typedef struct _GstBaseAudioEncoder GstBaseAudioEncoder;
 typedef struct _GstBaseAudioEncoderClass GstBaseAudioEncoderClass;