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 cb74d26b272254740f3c55e26161bce057eec3bc..f5a50e5180eaad6974433f1a39dff2bee8d94d86 100644 (file)
--- 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")