From 85d7b4de2a5586f22fac576fb3e6e8a54b013895 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@ronald.bitfreak.net>
Date: Sun, 11 Apr 2004 17:21:31 +0000
Subject: [PATCH] gst-libs/gst/riff/riff-media.c: Fix divx caps mismatch and
 move from video/x-jpeg to image/jpeg so that MJPEG plays b...

Original commit message from CVS:
* gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps):
Fix divx caps mismatch and move from video/x-jpeg to image/jpeg
so that MJPEG plays back.
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ac3ff3f0a8..5374e04c80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-11  Ronald Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps):
+	  Fix divx caps mismatch and move from video/x-jpeg to image/jpeg
+	  so that MJPEG plays back.
+
 2004-04-10  Ronald Bultje  <rbultje@ronald.bitfreak.net>
 
 	* gst/mpeg1videoparse/gstmp1videoparse.c: (gst_mp1videoparse_init),