From 481d98b7108d3f84d45c209bf5d2f4ba87201767 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Sun, 16 Nov 2008 14:41:32 +0000 Subject: [PATCH] gst/matroska/: Make mkvdemux aware of E-AC3. Original commit message from CVS: * gst/matroska/matroska-demux.c: (gst_matroska_demux_audio_caps): * gst/matroska/matroska-ids.h: Make mkvdemux aware of E-AC3. --- ChangeLog | 6 ++++++ gst/matroska/matroska-demux.c | 4 ++++ gst/matroska/matroska-ids.h | 1 + 3 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 870cead2ad..b47dda6bfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-11-16 Edward Hervey + + * gst/matroska/matroska-demux.c: (gst_matroska_demux_audio_caps): + * gst/matroska/matroska-ids.h: + Make mkvdemux aware of E-AC3. + 2008-11-14 Wim Taymans * gst/rtp/Makefile.am: diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index a7c14e7c4d..9e6adf9487 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -5330,6 +5330,10 @@ gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext * strlen (GST_MATROSKA_CODEC_ID_AUDIO_AC3))) { caps = gst_caps_new_simple ("audio/x-ac3", NULL); *codec_name = g_strdup ("AC-3 audio"); + } else if (!strncmp (codec_id, GST_MATROSKA_CODEC_ID_AUDIO_EAC3, + strlen (GST_MATROSKA_CODEC_ID_AUDIO_EAC3))) { + caps = gst_caps_new_simple ("audio/x-eac3", NULL); + *codec_name = g_strdup ("E-AC-3 audio"); } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_AUDIO_DTS)) { caps = gst_caps_new_simple ("audio/x-dts", NULL); *codec_name = g_strdup ("DTS audio"); diff --git a/gst/matroska/matroska-ids.h b/gst/matroska/matroska-ids.h index a1e03777de..73cc2e218e 100644 --- a/gst/matroska/matroska-ids.h +++ b/gst/matroska/matroska-ids.h @@ -347,6 +347,7 @@ #define GST_MATROSKA_CODEC_ID_AUDIO_AC3 "A_AC3" #define GST_MATROSKA_CODEC_ID_AUDIO_AC3_BSID9 "A_AC3/BSID9" #define GST_MATROSKA_CODEC_ID_AUDIO_AC3_BSID10 "A_AC3/BSID10" +#define GST_MATROSKA_CODEC_ID_AUDIO_EAC3 "A_EAC3" #define GST_MATROSKA_CODEC_ID_AUDIO_DTS "A_DTS" #define GST_MATROSKA_CODEC_ID_AUDIO_VORBIS "A_VORBIS" #define GST_MATROSKA_CODEC_ID_AUDIO_FLAC "A_FLAC"