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~6445
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5742352e100f6a28f8ad3871701940da90b324cb;p=platform%2Fupstream%2Fgstreamer.git

matroskamux: do not use unoffical V_MJPEG codec id

Since it's not spec'ed, consider it a VfW compatibility
case. Many applications (e.g. avidemux) don't understand
the unofficial V_MJPEG id.

Fixes #659837.

Conflicts:
	gst/matroska/matroska-mux.c
---

diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index cb74d26..f5a50e5 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -990,8 +990,6 @@ skip_details:
     fstr = gst_structure_get_string (structure, "format");
     if (fstr && strlen (fstr) == 4)
       videocontext->fourcc = GST_STR_FOURCC (fstr);
-  } else if (!strcmp (mimetype, "image/jpeg")) {
-    gst_matroska_mux_set_codec_id (context, GST_MATROSKA_CODEC_ID_VIDEO_MJPEG);
   } else if (!strcmp (mimetype, "video/x-huffyuv")      /* MS/VfW compatibility cases */
       ||!strcmp (mimetype, "video/x-divx")
       || !strcmp (mimetype, "video/x-dv")