diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2012-09-10 00:42:52 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2012-09-10 00:43:24 +0100 |
| commit | 6dc7b4c3c7eec337dc77652bf0df64b50d46b04e (patch) | |
| tree | 2d753a7f9eac588b5a848d3da38ee381cca9a044 /gst | |
| parent | 03fbd7ec6e15192e9b50dee040ab3be2d5394379 (diff) | |
| download | gstreamer-plugins-good-6dc7b4c3c7eec337dc77652bf0df64b50d46b04e.tar.gz | |
video/x-3ivx and video/x-xvid -> video/mpeg,mpegversion=4
If it ever turns out that we really must use thoe specific
fourccs and not the generic one, we can still add a flavor
field to the caps later.
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/avi/gstavimux.c | 8 | ||||
| -rw-r--r-- | gst/isomp4/qtdemux.c | 14 |
2 files changed, 4 insertions, 18 deletions
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index 79e24c9ad..8420cbf09 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -106,10 +106,6 @@ static GstStaticPadTemplate video_sink_factory = "height = (int) [ 16, 4096 ], " "framerate = (fraction) [ 0, MAX ], " "divxversion = (int) [ 3, 5 ]; " - "video/x-3ivx, " - "width = (int) [ 16, 4096 ], " - "height = (int) [ 16, 4096 ], " - "framerate = (fraction) [ 0, MAX ]; " "video/x-msmpeg, " "width = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], " @@ -507,10 +503,6 @@ gst_avi_mux_vidsink_set_caps (GstPad * pad, GstCaps * vscaps) avipad->vids.compression = GST_MAKE_FOURCC ('D', 'X', '5', '0'); break; } - } else if (!strcmp (mimetype, "video/x-xvid")) { - avipad->vids.compression = GST_MAKE_FOURCC ('X', 'V', 'I', 'D'); - } else if (!strcmp (mimetype, "video/x-3ivx")) { - avipad->vids.compression = GST_MAKE_FOURCC ('3', 'I', 'V', '2'); } else if (gst_structure_has_name (structure, "video/x-msmpeg")) { gint msmpegversion; diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c index fba56415d..6e3e5c97b 100644 --- a/gst/isomp4/qtdemux.c +++ b/gst/isomp4/qtdemux.c @@ -9416,11 +9416,6 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream, caps = gst_caps_new_simple ("video/x-msmpeg", "msmpegversion", G_TYPE_INT, 43, NULL); break; - case GST_MAKE_FOURCC ('3', 'I', 'V', '1'): - case GST_MAKE_FOURCC ('3', 'I', 'V', '2'): - _codec ("3ivX video"); - caps = gst_caps_new_empty_simple ("video/x-3ivx"); - break; case GST_MAKE_FOURCC ('D', 'I', 'V', '3'): _codec ("DivX 3"); caps = gst_caps_new_simple ("video/x-divx", @@ -9437,18 +9432,17 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream, caps = gst_caps_new_simple ("video/x-divx", "divxversion", G_TYPE_INT, 5, NULL); break; + + case GST_MAKE_FOURCC ('3', 'I', 'V', '1'): + case GST_MAKE_FOURCC ('3', 'I', 'V', '2'): case GST_MAKE_FOURCC ('X', 'V', 'I', 'D'): case GST_MAKE_FOURCC ('x', 'v', 'i', 'd'): - _codec ("XVID MPEG-4"); - caps = gst_caps_new_empty_simple ("video/x-xvid"); - break; - case GST_MAKE_FOURCC ('F', 'M', 'P', '4'): case GST_MAKE_FOURCC ('U', 'M', 'P', '4'): caps = gst_caps_new_simple ("video/mpeg", "mpegversion", G_TYPE_INT, 4, NULL); if (codec_name) - *codec_name = g_strdup ("FFmpeg MPEG-4"); + *codec_name = g_strdup ("MPEG-4"); break; case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'): |