From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Mon, 31 Oct 2011 14:43:25 +0000 (+0100)
Subject: matroskamux: do not use unoffical V_MJPEG codec id
X-Git-Tag: 1.19.3~509^2~7136^2~283
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00c8ae733dbeb4a8766d7e8148f81610c6a6ff08;p=platform%2Fupstream%2Fgstreamer.git

matroskamux: do not use unoffical V_MJPEG codec id

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

Fixes #659837.
---

diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 5204b39a6e..01a171396c 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -796,15 +796,14 @@ skip_details:
   if (!strcmp (mimetype, "video/x-raw-yuv")) {
     context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_VIDEO_UNCOMPRESSED);
     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 */
       ||!strcmp (mimetype, "video/x-huffyuv")
       || !strcmp (mimetype, "video/x-divx")
       || !strcmp (mimetype, "video/x-dv")
       || !strcmp (mimetype, "video/x-h263")
       || !strcmp (mimetype, "video/x-msmpeg")
-      || !strcmp (mimetype, "video/x-wmv")) {
+      || !strcmp (mimetype, "video/x-wmv")
+      || !strcmp (mimetype, "image/jpeg")) {
     gst_riff_strf_vids *bih;
     gint size = sizeof (gst_riff_strf_vids);
     guint32 fourcc = 0;
@@ -861,6 +860,8 @@ skip_details:
           fourcc = GST_MAKE_FOURCC ('W', 'M', 'V', '3');
         }
       }
+    } else if (!strcmp (mimetype, "image/jpeg")) {
+      fourcc = GST_MAKE_FOURCC ('M', 'J', 'P', 'G');
     }
 
     if (!fourcc)