mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-08 21:28:45 +00:00
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.
This commit is contained in:
parent
03fbd7ec6e
commit
6dc7b4c3c7
2 changed files with 4 additions and 18 deletions
|
@ -106,10 +106,6 @@ static GstStaticPadTemplate video_sink_factory =
|
||||||
"height = (int) [ 16, 4096 ], "
|
"height = (int) [ 16, 4096 ], "
|
||||||
"framerate = (fraction) [ 0, MAX ], "
|
"framerate = (fraction) [ 0, MAX ], "
|
||||||
"divxversion = (int) [ 3, 5 ]; "
|
"divxversion = (int) [ 3, 5 ]; "
|
||||||
"video/x-3ivx, "
|
|
||||||
"width = (int) [ 16, 4096 ], "
|
|
||||||
"height = (int) [ 16, 4096 ], "
|
|
||||||
"framerate = (fraction) [ 0, MAX ]; "
|
|
||||||
"video/x-msmpeg, "
|
"video/x-msmpeg, "
|
||||||
"width = (int) [ 16, 4096 ], "
|
"width = (int) [ 16, 4096 ], "
|
||||||
"height = (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');
|
avipad->vids.compression = GST_MAKE_FOURCC ('D', 'X', '5', '0');
|
||||||
break;
|
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")) {
|
} else if (gst_structure_has_name (structure, "video/x-msmpeg")) {
|
||||||
gint msmpegversion;
|
gint msmpegversion;
|
||||||
|
|
||||||
|
|
|
@ -9416,11 +9416,6 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
|
||||||
caps = gst_caps_new_simple ("video/x-msmpeg",
|
caps = gst_caps_new_simple ("video/x-msmpeg",
|
||||||
"msmpegversion", G_TYPE_INT, 43, NULL);
|
"msmpegversion", G_TYPE_INT, 43, NULL);
|
||||||
break;
|
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'):
|
case GST_MAKE_FOURCC ('D', 'I', 'V', '3'):
|
||||||
_codec ("DivX 3");
|
_codec ("DivX 3");
|
||||||
caps = gst_caps_new_simple ("video/x-divx",
|
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",
|
caps = gst_caps_new_simple ("video/x-divx",
|
||||||
"divxversion", G_TYPE_INT, 5, NULL);
|
"divxversion", G_TYPE_INT, 5, NULL);
|
||||||
break;
|
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'):
|
||||||
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 ('F', 'M', 'P', '4'):
|
||||||
case GST_MAKE_FOURCC ('U', 'M', 'P', '4'):
|
case GST_MAKE_FOURCC ('U', 'M', 'P', '4'):
|
||||||
caps = gst_caps_new_simple ("video/mpeg",
|
caps = gst_caps_new_simple ("video/mpeg",
|
||||||
"mpegversion", G_TYPE_INT, 4, NULL);
|
"mpegversion", G_TYPE_INT, 4, NULL);
|
||||||
if (codec_name)
|
if (codec_name)
|
||||||
*codec_name = g_strdup ("FFmpeg MPEG-4");
|
*codec_name = g_strdup ("MPEG-4");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'):
|
case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'):
|
||||||
|
|
Loading…
Reference in a new issue