From 2b6838d77c8fa4efbd24f8545449667c7aae65bd Mon Sep 17 00:00:00 2001
From: Tim-Philipp Müller <tim@centricular.net>
Date: Tue, 18 Oct 2005 18:06:14 +0000
Subject: gst/matroska/matroska-mux.c: Fix mpeg4 input handling (#318847);
 also, while we're at it, fix media type for Motion-J...
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Original commit message from CVS:
Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
* gst/matroska/matroska-mux.c:
(gst_matroska_mux_video_pad_setcaps),
(gst_matroska_mux_audio_pad_setcaps):
Fix mpeg4 input handling (#318847); also, while we're at it,
fix media type for Motion-JPEG: should be image/jpeg.
---
 ChangeLog | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 7fb000df..e375703e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-18  Michal Benes  <michal dot benes at xeris dot cz>
+
+	Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/matroska/matroska-mux.c:
+	(gst_matroska_mux_video_pad_setcaps),
+	(gst_matroska_mux_audio_pad_setcaps):
+	  Fix mpeg4 input handling (#318847); also, while we're at it,
+	  fix media type for Motion-JPEG: should be image/jpeg.
+
 2005-10-18  Wim Taymans  <wim@fluendo.com>
 
 	* gst/wavparse/gstwavparse.c: (gst_wavparse_handle_seek),
-- 
cgit