From cf9b2149dda85268fb36bc8f423e0b7cac6cd0d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Fri, 6 Jul 2012 12:54:02 +0100
Subject: [PATCH] isomp4: remove gppmux, which was deprecated in favour of
 3gppmux

---
 gst/isomp4/gstqtmux.c                |  5 ++---
 gst/isomp4/gstqtmuxmap.c             | 15 ---------------
 tests/check/pipelines/tagschecking.c |  6 +++---
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/gst/isomp4/gstqtmux.c b/gst/isomp4/gstqtmux.c
index 3c1636abd1..4c74f25bda 100644
--- a/gst/isomp4/gstqtmux.c
+++ b/gst/isomp4/gstqtmux.c
@@ -252,9 +252,8 @@ gst_qt_mux_base_init (gpointer g_class)
 
   /* construct the element details struct */
   longname = g_strdup_printf ("%s Muxer", params->prop->long_name);
-  description = g_strdup_printf ("Multiplex audio and video into a %s file%s",
-      params->prop->long_name,
-      (params->prop->rank == GST_RANK_NONE) ? " (deprecated)" : "");
+  description = g_strdup_printf ("Multiplex audio and video into a %s file",
+      params->prop->long_name);
   gst_element_class_set_static_metadata (element_class, longname,
       "Codec/Muxer", description,
       "Thiago Sousa Santos <thiagoss@embedded.ufcg.edu.br>");
diff --git a/gst/isomp4/gstqtmuxmap.c b/gst/isomp4/gstqtmuxmap.c
index 0d41eb7367..29675b44a6 100644
--- a/gst/isomp4/gstqtmuxmap.c
+++ b/gst/isomp4/gstqtmuxmap.c
@@ -210,21 +210,6 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
         GST_STATIC_CAPS (AMR_CAPS "; " MP3_CAPS "; " AAC_CAPS)
       }
   ,
-#ifndef GST_REMOVE_DEPRECATED
-  /* 3GPP Technical Specification 26.244 V7.3.0
-   * (extended in 3GPP2 File Formats for Multimedia Services) */
-  {
-        GST_QT_MUX_FORMAT_3GP,
-        GST_RANK_NONE,
-        "gppmux",
-        "3GPP",
-        "GstGPPMux",
-        GST_STATIC_CAPS ("video/quicktime, variant = (string) 3gpp"),
-        GST_STATIC_CAPS (H263_CAPS "; " MPEG4V_CAPS "; " H264_CAPS),
-        GST_STATIC_CAPS (AMR_CAPS "; " MP3_CAPS "; " AAC_CAPS)
-      }
-  ,
-#endif
   /* ISO 15444-3: Motion-JPEG-2000 (also ISO base media extension) */
   {
         GST_QT_MUX_FORMAT_MJ2,
diff --git a/tests/check/pipelines/tagschecking.c b/tests/check/pipelines/tagschecking.c
index dc4b11ca1b..e0ed87983e 100644
--- a/tests/check/pipelines/tagschecking.c
+++ b/tests/check/pipelines/tagschecking.c
@@ -288,7 +288,7 @@ GST_START_TEST (test_common_tags)
   }
   test_tags (COMMON_TAGS, H264_CAPS, "qtmux", "qtdemux");
   test_tags (COMMON_TAGS, H264_CAPS, "mp4mux", "qtdemux");
-  test_tags (COMMON_TAGS, H264_CAPS, "gppmux", "qtdemux");
+  test_tags (COMMON_TAGS, H264_CAPS, "3gppmux", "qtdemux");
 }
 
 GST_END_TEST;
@@ -310,7 +310,7 @@ GST_START_TEST (test_geo_location_tags)
   }
   test_tags (GEO_LOCATION_TAGS, H264_CAPS, "qtmux", "qtdemux");
   test_tags (GEO_LOCATION_TAGS, H264_CAPS, "mp4mux", "qtdemux");
-  test_tags (GEO_LOCATION_TAGS, H264_CAPS, "gppmux", "qtdemux");
+  test_tags (GEO_LOCATION_TAGS, H264_CAPS, "3gppmux", "qtdemux");
 }
 
 GST_END_TEST;
@@ -329,7 +329,7 @@ GST_START_TEST (test_user_tags)
 
   test_tags (USER_TAGS, H264_CAPS, "qtmux", "qtdemux");
   test_tags (USER_TAGS, H264_CAPS, "mp4mux", "qtdemux");
-  test_tags (USER_TAGS, H264_CAPS, "gppmux", "qtdemux");
+  test_tags (USER_TAGS, H264_CAPS, "3gppmux", "qtdemux");
 }
 
 GST_END_TEST;