From 1ec7724889bbb95501530677537974f97178ab58 Mon Sep 17 00:00:00 2001 From: "Arwed v. Merkatz" Date: Wed, 15 Sep 2004 19:43:38 +0000 Subject: [PATCH] use audio/x-ttafile and audio/x-tta for tta instead of audio/x-tta and audio/x-raw-tta Original commit message from CVS: use audio/x-ttafile and audio/x-tta for tta instead of audio/x-tta and audio/x-raw-tta --- ChangeLog | 8 ++++++++ gst/typefind/gsttypefindfunctions.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1026882268..4b2b83622b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-09-15 Arwed v. Merkatz + + * gst/matroska/matroska-demux.c: (gst_matroska_demux_audio_caps): + * gst/matroska/matroska-mux.c: (audiosink_templ), + (gst_matroska_mux_audio_pad_link): + * gst/typefind/gsttypefindfunctions.c: (tta_caps), (plugin_init): + Use audio/x-ttafile for tta files and audio/x-tta for raw tta frames. + 2004-09-15 Ronald S. Bultje * gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query), diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c index 6bed020402..220111abc9 100644 --- a/gst/typefind/gsttypefindfunctions.c +++ b/gst/typefind/gsttypefindfunctions.c @@ -190,9 +190,9 @@ id3_type_find (GstTypeFind * tf, gpointer unused) } } -/*** audio/x-tta *************************************************************/ +/*** audio/x-ttafile *********************************************************/ -static GstStaticCaps tta_caps = GST_STATIC_CAPS ("audio/x-tta"); +static GstStaticCaps tta_caps = GST_STATIC_CAPS ("audio/x-ttafile"); #define TTA_CAPS gst_static_caps_get(&tta_caps) static void @@ -1385,7 +1385,7 @@ plugin_init (GstPlugin * plugin) flx_exts, FLX_CAPS, NULL); TYPE_FIND_REGISTER (plugin, "application/x-id3", GST_RANK_PRIMARY, id3_type_find, id3_exts, ID3_CAPS, NULL); - TYPE_FIND_REGISTER (plugin, "audio/x-tta", GST_RANK_PRIMARY, + TYPE_FIND_REGISTER (plugin, "audio/x-ttafile", GST_RANK_PRIMARY, tta_type_find, tta_exts, TTA_CAPS, NULL); TYPE_FIND_REGISTER (plugin, "audio/x-mod", GST_RANK_SECONDARY, mod_type_find, mod_exts, MOD_CAPS, NULL);