Commit cf9b2149 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller

isomp4: remove gppmux, which was deprecated in favour of 3gppmux

parent 1cb8295b
...@@ -252,9 +252,8 @@ gst_qt_mux_base_init (gpointer g_class) ...@@ -252,9 +252,8 @@ gst_qt_mux_base_init (gpointer g_class)
/* construct the element details struct */ /* construct the element details struct */
longname = g_strdup_printf ("%s Muxer", params->prop->long_name); longname = g_strdup_printf ("%s Muxer", params->prop->long_name);
description = g_strdup_printf ("Multiplex audio and video into a %s file%s", description = g_strdup_printf ("Multiplex audio and video into a %s file",
params->prop->long_name, params->prop->long_name);
(params->prop->rank == GST_RANK_NONE) ? " (deprecated)" : "");
gst_element_class_set_static_metadata (element_class, longname, gst_element_class_set_static_metadata (element_class, longname,
"Codec/Muxer", description, "Codec/Muxer", description,
"Thiago Sousa Santos <thiagoss@embedded.ufcg.edu.br>"); "Thiago Sousa Santos <thiagoss@embedded.ufcg.edu.br>");
......
...@@ -210,21 +210,6 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = { ...@@ -210,21 +210,6 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
GST_STATIC_CAPS (AMR_CAPS "; " MP3_CAPS "; " AAC_CAPS) 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) */ /* ISO 15444-3: Motion-JPEG-2000 (also ISO base media extension) */
{ {
GST_QT_MUX_FORMAT_MJ2, GST_QT_MUX_FORMAT_MJ2,
......
...@@ -288,7 +288,7 @@ GST_START_TEST (test_common_tags) ...@@ -288,7 +288,7 @@ GST_START_TEST (test_common_tags)
} }
test_tags (COMMON_TAGS, H264_CAPS, "qtmux", "qtdemux"); test_tags (COMMON_TAGS, H264_CAPS, "qtmux", "qtdemux");
test_tags (COMMON_TAGS, H264_CAPS, "mp4mux", "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; GST_END_TEST;
...@@ -310,7 +310,7 @@ GST_START_TEST (test_geo_location_tags) ...@@ -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, "qtmux", "qtdemux");
test_tags (GEO_LOCATION_TAGS, H264_CAPS, "mp4mux", "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; GST_END_TEST;
...@@ -329,7 +329,7 @@ GST_START_TEST (test_user_tags) ...@@ -329,7 +329,7 @@ GST_START_TEST (test_user_tags)
test_tags (USER_TAGS, H264_CAPS, "qtmux", "qtdemux"); test_tags (USER_TAGS, H264_CAPS, "qtmux", "qtdemux");
test_tags (USER_TAGS, H264_CAPS, "mp4mux", "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; GST_END_TEST;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment