From 9b08b5307fd2151440c8232d8f088fcc30477865 Mon Sep 17 00:00:00 2001
From: Mersad Jelacic <mersad@axis.com>
Date: Thu, 28 Aug 2008 10:09:16 +0000
Subject: gst/multipart/: Convert audio/x-adpcm to and from the audio/G726-X in
 the muxer and demuxer. Fixes #549551.

Original commit message from CVS:
Patch by: Mersad Jelacic <mersad at axis dot com>
* gst/multipart/multipartdemux.c:
* gst/multipart/multipartmux.c: (gst_multipart_mux_get_mime):
Convert audio/x-adpcm to and from the audio/G726-X in the muxer and
demuxer. Fixes #549551.
---
 ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 805e2fc5..180bfd40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-28  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	Patch by: Mersad Jelacic <mersad at axis dot com>
+
+	* gst/multipart/multipartdemux.c:
+	* gst/multipart/multipartmux.c: (gst_multipart_mux_get_mime):
+	Convert audio/x-adpcm to and from the audio/G726-X in the muxer and
+	demuxer. Fixes #549551.
+
 2008-08-27  Edward Hervey  <edward.hervey@collabora.co.uk>
 
 	* sys/osxaudio/gstosxaudiosink.c:
-- 
cgit