mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 12:41:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

video/x-xvid -> video/mpeg,mpegversion=4

Browse source
This commit is contained in:
Tim-Philipp Müller 2012-09-02 22:32:12 +01:00
parent 041c16b47d
commit ba7d738d9e
3 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gst-libs/gst/pbutils/descriptions.c
View file

@ -208,7 +208,6 @@ static const FormatInfo formats[] = {
{"video/x-vp6-alpha", "On2 VP6 with alpha", 0}, {"video/x-vp6-alpha", "On2 VP6 with alpha", 0},
{"video/x-vp7", "On2 VP7", 0}, {"video/x-vp7", "On2 VP7", 0},
{"video/x-vp8", "VP8", 0}, {"video/x-vp8", "VP8", 0},
{"video/x-xvid", "XVID MPEG-4", 0},
{"video/x-zlib", "Lossless zlib video", 0}, {"video/x-zlib", "Lossless zlib video", 0},
{"video/x-zmbv", "Zip Motion Block video", 0}, {"video/x-zmbv", "Zip Motion Block video", 0},

16
gst-libs/gst/riff/riff-media.c
View file

@ -407,19 +407,6 @@ gst_riff_create_video_caps (guint32 codec_fcc,
*codec_name = g_strdup ("DivX MPEG-4 Version 5"); *codec_name = g_strdup ("DivX MPEG-4 Version 5");
break; break;
case GST_MAKE_FOURCC ('X', 'V', 'I', 'D'):
case GST_MAKE_FOURCC ('x', 'v', 'i', 'd'):
caps = gst_caps_new_empty_simple ("video/x-xvid");
if (codec_name)
*codec_name = g_strdup ("XVID MPEG-4");
break;
case GST_MAKE_FOURCC ('R', 'M', 'P', '4'):
caps = gst_caps_new_empty_simple ("video/x-xvid");
if (codec_name)
*codec_name = g_strdup ("Sigma-Designs MPEG-4");
break;
case GST_MAKE_FOURCC ('M', 'P', 'G', '4'): case GST_MAKE_FOURCC ('M', 'P', 'G', '4'):
case GST_MAKE_FOURCC ('M', 'P', '4', '1'): case GST_MAKE_FOURCC ('M', 'P', '4', '1'):
case GST_MAKE_FOURCC ('m', 'p', '4', '1'): case GST_MAKE_FOURCC ('m', 'p', '4', '1'):
@ -462,6 +449,8 @@ gst_riff_create_video_caps (guint32 codec_fcc,
*codec_name = g_strdup ("FFmpeg MPEG-4"); *codec_name = g_strdup ("FFmpeg MPEG-4");
break; break;
case GST_MAKE_FOURCC ('X', 'V', 'I', 'D'):
case GST_MAKE_FOURCC ('x', 'v', 'i', 'd'):
case GST_MAKE_FOURCC ('E', 'M', '4', 'A'): case GST_MAKE_FOURCC ('E', 'M', '4', 'A'):
case GST_MAKE_FOURCC ('E', 'P', 'V', 'H'): case GST_MAKE_FOURCC ('E', 'P', 'V', 'H'):
case GST_MAKE_FOURCC ('F', 'V', 'F', 'W'): case GST_MAKE_FOURCC ('F', 'V', 'F', 'W'):
@ -478,6 +467,7 @@ gst_riff_create_video_caps (guint32 codec_fcc,
case GST_MAKE_FOURCC ('G', 'E', 'O', 'X'): case GST_MAKE_FOURCC ('G', 'E', 'O', 'X'):
case GST_MAKE_FOURCC ('M', 'P', '4', 'V'): case GST_MAKE_FOURCC ('M', 'P', '4', 'V'):
case GST_MAKE_FOURCC ('m', 'p', '4', 'v'): case GST_MAKE_FOURCC ('m', 'p', '4', 'v'):
case GST_MAKE_FOURCC ('R', '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)

2
tests/check/libs/pbutils.c
View file

@ -275,7 +275,7 @@ static const gchar *caps_strings[] = {
"video/x-smoke", "video/x-tarkin", "video/x-theora", "video/x-rle", "video/x-smoke", "video/x-tarkin", "video/x-theora", "video/x-rle",
"video/x-ultimotion", "video/x-vcd", "video/x-vmnc", "video/x-vp3", "video/x-ultimotion", "video/x-vcd", "video/x-vmnc", "video/x-vp3",
"video/x-vp5", "video/x-vp6", "video/x-vp6-flash", "video/x-vp7", "video/x-vp5", "video/x-vp6", "video/x-vp6-flash", "video/x-vp7",
"video/x-xvid", "video/x-zlib", "image/bmp", "image/x-bmp", "video/x-zlib", "image/bmp", "image/x-bmp",
"image/x-MS-bmp", "image/gif", "image/jpeg", "image/jng", "image/png", "image/x-MS-bmp", "image/gif", "image/jpeg", "image/jng", "image/png",
"image/pbm", "image/ppm", "image/svg+xml", "image/tiff", "image/pbm", "image/ppm", "image/svg+xml", "image/tiff",
"image/x-cmu-raster", "image/x-icon", "image/x-xcf", "image/x-pixmap", "image/x-cmu-raster", "image/x-icon", "image/x-xcf", "image/x-pixmap",