gst-plugins-bad: mpegdemux: include specific AAC stream-format types in template caps

[Vincent Penquerc'h]

Module: gst-plugins-bad
Branch: master
Commit: 5c8ca4e1d03620223a0dce72a1515199bfb1d872
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=5c8ca4e1d03620223a0dce72a1515199bfb1d872

Author: Vincent Penquerc'h <vincent.penquerch at collabora.co.uk>
Date:   Thu Feb  2 11:20:38 2012 +0000

mpegdemux: include specific AAC stream-format types in template caps

https://bugzilla.gnome.org/show_bug.cgi?id=665394

---

 gst/mpegdemux/gstmpegdemux.c   |    4 ++--
 gst/mpegdemux/gstmpegtsdemux.c |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c
index 0da3e0c..7e9fb14 100644
--- a/gst/mpegdemux/gstmpegdemux.c
+++ b/gst/mpegdemux/gstmpegdemux.c
@@ -118,8 +118,8 @@ static GstStaticPadTemplate audio_template =
     GST_STATIC_PAD_TEMPLATE ("audio_%02x",
     GST_PAD_SRC,
     GST_PAD_SOMETIMES,
-    GST_STATIC_CAPS ("audio/mpeg, "
-        "mpegversion = (int) { 1, 4 };"
+    GST_STATIC_CAPS ("audio/mpeg, mpegversion = (int) 1;"
+        "audio/mpeg, mpegversion = (int) 4, stream-format = (string) { adts, loas };"
         "audio/x-private1-lpcm; "
         "audio/x-private1-ac3;" "audio/x-private1-dts;" "audio/ac3")
     );
diff --git a/gst/mpegdemux/gstmpegtsdemux.c b/gst/mpegdemux/gstmpegtsdemux.c
index 2c6db7d..a7c3a17 100644
--- a/gst/mpegdemux/gstmpegtsdemux.c
+++ b/gst/mpegdemux/gstmpegtsdemux.c
@@ -125,7 +125,10 @@ enum
 #define AUDIO_CAPS \
   GST_STATIC_CAPS ( \
     "audio/mpeg, " \
-      "mpegversion = (int) { 1, 4 };" \
+      "mpegversion = (int) 1;" \
+    "audio/mpeg, " \
+      "mpegversion = (int) 4, " \
+      "stream-format = (string) { adts, loas };" \
     "audio/x-lpcm, " \
       "width = (int) { 16, 20, 24 }, " \
       "rate = (int) { 48000, 96000 }, " \