From e4fed38f498870b91f9307f47efb4254ab4df977 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Tue, 13 Mar 2012 17:27:32 +0100
Subject: [PATCH] rtp: fix unmap calls

---
 gst/rtp/gstrtph264depay.c | 4 +++-
 gst/rtp/gstrtpmp4gdepay.c | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gst/rtp/gstrtph264depay.c b/gst/rtp/gstrtph264depay.c
index 3e39606a94..9a5c8f2a35 100644
--- a/gst/rtp/gstrtph264depay.c
+++ b/gst/rtp/gstrtph264depay.c
@@ -558,6 +558,8 @@ gst_rtp_h264_depay_handle_nal (GstRtpH264Depay * rtph264depay, GstBuffer * nal,
           &out_keyframe);
 
     /* add to adapter */
+    gst_buffer_unmap (nal, &map);
+
     GST_DEBUG_OBJECT (depayload, "adding NAL to picture adapter");
     gst_adapter_push (rtph264depay->picture_adapter, nal);
     rtph264depay->last_ts = in_timestamp;
@@ -571,8 +573,8 @@ gst_rtp_h264_depay_handle_nal (GstRtpH264Depay * rtph264depay, GstBuffer * nal,
     /* no merge, output is input nal */
     GST_DEBUG_OBJECT (depayload, "using NAL as output");
     outbuf = nal;
+    gst_buffer_unmap (nal, &map);
   }
-  gst_buffer_unmap (nal, &map);
 
   if (outbuf) {
     /* prepend codec_data */
diff --git a/gst/rtp/gstrtpmp4gdepay.c b/gst/rtp/gstrtpmp4gdepay.c
index e619e5b4b2..c86cc6acf5 100644
--- a/gst/rtp/gstrtpmp4gdepay.c
+++ b/gst/rtp/gstrtpmp4gdepay.c
@@ -453,8 +453,6 @@ gst_rtp_mp4g_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
     rtptime = gst_rtp_buffer_get_timestamp (&rtp);
     M = gst_rtp_buffer_get_marker (&rtp);
 
-    gst_rtp_buffer_unmap (&rtp);
-
     if (rtpmp4gdepay->sizelength > 0) {
       gint num_AU_headers, AU_headers_bytes, i;
       GstBsParse bs;