mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

matroskamux: do not use unoffical V_MJPEG codec id

Browse source 
... but as not spec'ed especially, consider it a VfW compatibility case.

Fixes #659837.
This commit is contained in:
Mark Nauwelaerts 2011-10-31 15:43:25 +01:00
parent d6e1f53233
commit 00c8ae733d
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/matroska/matroska-mux.c
View file

@ -796,15 +796,14 @@ skip_details:
if (!strcmp (mimetype, "video/x-raw-yuv")) { if (!strcmp (mimetype, "video/x-raw-yuv")) {
context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_VIDEO_UNCOMPRESSED); context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_VIDEO_UNCOMPRESSED);
gst_structure_get_fourcc (structure, "format", &videocontext->fourcc); gst_structure_get_fourcc (structure, "format", &videocontext->fourcc);
} else if (!strcmp (mimetype, "image/jpeg")) {
context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_VIDEO_MJPEG);
} else if (!strcmp (mimetype, "video/x-xvid") /* MS/VfW compatibility cases */ } else if (!strcmp (mimetype, "video/x-xvid") /* MS/VfW compatibility cases */
||!strcmp (mimetype, "video/x-huffyuv") ||!strcmp (mimetype, "video/x-huffyuv")
|| !strcmp (mimetype, "video/x-divx") || !strcmp (mimetype, "video/x-divx")
|| !strcmp (mimetype, "video/x-dv") || !strcmp (mimetype, "video/x-dv")
|| !strcmp (mimetype, "video/x-h263") || !strcmp (mimetype, "video/x-h263")
|| !strcmp (mimetype, "video/x-msmpeg") || !strcmp (mimetype, "video/x-msmpeg")
|| !strcmp (mimetype, "video/x-wmv")) { || !strcmp (mimetype, "video/x-wmv")
|| !strcmp (mimetype, "image/jpeg")) {
gst_riff_strf_vids *bih; gst_riff_strf_vids *bih;
gint size = sizeof (gst_riff_strf_vids); gint size = sizeof (gst_riff_strf_vids);
guint32 fourcc = 0; guint32 fourcc = 0;
@ -861,6 +860,8 @@ skip_details:
fourcc = GST_MAKE_FOURCC ('W', 'M', 'V', '3'); fourcc = GST_MAKE_FOURCC ('W', 'M', 'V', '3');
} }
} }
} else if (!strcmp (mimetype, "image/jpeg")) {
fourcc = GST_MAKE_FOURCC ('M', 'J', 'P', 'G');
} }
if (!fourcc) if (!fourcc)