From 47d8015fe4504600e85e177ad1c1dd3d537c5fc3 Mon Sep 17 00:00:00 2001
From: Arnaud Vrac <avrac@freebox.fr>
Date: Wed, 29 Aug 2012 17:22:59 +0200
Subject: Tweak DTS and AC3 codec names


diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
index 3c2d917..d9766b1 100644
--- a/gst/isomp4/qtdemux.c
+++ b/gst/isomp4/qtdemux.c
@@ -9284,7 +9284,7 @@ gst_qtdemux_handle_esds (GstQTDemux * qtdemux, QtDemuxStream * stream,
       caps = gst_caps_new_empty_simple ("video/x-dirac");
       break;
     case 0xA5:                 /* AC3 */
-      codec_name = "AC-3 audio";
+      codec_name = "Dolby Digital";
       caps = gst_caps_new_simple ("audio/x-ac3",
           "framed", G_TYPE_BOOLEAN, TRUE, NULL);
       break;
@@ -9767,13 +9767,13 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
       break;
     case 0x20736d:
     case GST_MAKE_FOURCC ('e', 'c', '-', '3'):
-      _codec ("EAC-3 audio");
+      _codec ("Dolby Digital Plus");
       caps = gst_caps_new_simple ("audio/x-eac3",
           "framed", G_TYPE_BOOLEAN, TRUE, NULL);
       stream->sampled = TRUE;
       break;
     case GST_MAKE_FOURCC ('a', 'c', '-', '3'):
-      _codec ("AC-3 audio");
+      _codec ("Dolby Digital");
       caps = gst_caps_new_simple ("audio/x-ac3",
           "framed", G_TYPE_BOOLEAN, TRUE, NULL);
       stream->sampled = TRUE;
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index fff354b..f9c2564 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -5367,15 +5367,15 @@ gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext *
           strlen (GST_MATROSKA_CODEC_ID_AUDIO_AC3))) {
     caps = gst_caps_new_simple ("audio/x-ac3",
         "framed", G_TYPE_BOOLEAN, TRUE, NULL);
-    *codec_name = g_strdup ("AC-3 audio");
+    *codec_name = g_strdup ("Dolby Digital");
   } 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",
         "framed", G_TYPE_BOOLEAN, TRUE, NULL);
-    *codec_name = g_strdup ("E-AC-3 audio");
+    *codec_name = g_strdup ("Dolby Digital Plus");
   } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_AUDIO_DTS)) {
     caps = gst_caps_new_empty_simple ("audio/x-dts");
-    *codec_name = g_strdup ("DTS audio");
+    *codec_name = g_strdup ("DTS");
   } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_AUDIO_VORBIS)) {
     caps = gst_caps_new_empty_simple ("audio/x-vorbis");
     context->send_xiph_headers = TRUE;
-- 
1.7.10.4