summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2009-04-29 13:56:07 +0200
committerDave Robillard <dave@drobilla.net>2009-05-03 12:03:19 -0400
commit2b9c03b1d316f0d24b5fcc85a5b4f6c7546f159f (patch)
tree1f95e0302bdffbfadc444fa7bcc57f41ca6c0b73 /gst
parent228057310290988ce8e986aa6c1052b2fc84c113 (diff)
downloadgst-plugins-bad-2b9c03b1d316f0d24b5fcc85a5b4f6c7546f159f.tar.gz
gst-plugins-bad-2b9c03b1d316f0d24b5fcc85a5b4f6c7546f159f.tar.bz2
gst-plugins-bad-2b9c03b1d316f0d24b5fcc85a5b4f6c7546f159f.zip
flv: Set/require the framed/parsed fields of the audio/mpeg caps to TRUE
Diffstat (limited to 'gst')
-rw-r--r--gst/flv/gstflvmux.c4
-rw-r--r--gst/flv/gstflvparse.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/gst/flv/gstflvmux.c b/gst/flv/gstflvmux.c
index b34a14a1..d0b6411d 100644
--- a/gst/flv/gstflvmux.c
+++ b/gst/flv/gstflvmux.c
@@ -62,8 +62,8 @@ static GstStaticPadTemplate audiosink_templ = GST_STATIC_PAD_TEMPLATE ("audio",
GST_PAD_REQUEST,
GST_STATIC_CAPS
("audio/x-adpcm, layout = (string) swf, channels = (int) { 1, 2 }, rate = (int) { 5512, 11025, 22050, 44100 }; "
- "audio/mpeg, mpegversion = (int) 1, layer = (int) 3, channels = (int) { 1, 2 }, rate = (int) { 5512, 8000, 11025, 22050, 44100 }; "
- "audio/mpeg, mpegversion = (int) 4; "
+ "audio/mpeg, mpegversion = (int) 1, layer = (int) 3, channels = (int) { 1, 2 }, rate = (int) { 5512, 8000, 11025, 22050, 44100 }, parsed = (boolean) TRUE; "
+ "audio/mpeg, mpegversion = (int) 4, framed = (boolean) TRUE; "
"audio/x-nellymoser, channels = (int) { 1, 2 }, rate = (int) { 5512, 8000, 11025, 16000, 22050, 44100 }; "
"audio/x-raw-int, endianness = (int) LITTLE_ENDIAN, channels = (int) { 1, 2 }, width = (int) 8, depth = (int) 8, rate = (int) { 5512, 11025, 22050, 44100 }, signed = (boolean) FALSE; "
"audio/x-raw-int, endianness = (int) LITTLE_ENDIAN, channels = (int) { 1, 2 }, width = (int) 16, depth = (int) 16, rate = (int) { 5512, 11025, 22050, 44100 }, signed = (boolean) TRUE; "
diff --git a/gst/flv/gstflvparse.c b/gst/flv/gstflvparse.c
index b9266685..59446512 100644
--- a/gst/flv/gstflvparse.c
+++ b/gst/flv/gstflvparse.c
@@ -478,7 +478,7 @@ gst_flv_parse_audio_negotiate (GstFLVDemux * demux, guint32 codec_tag,
break;
case 10:
caps = gst_caps_new_simple ("audio/mpeg",
- "mpegversion", G_TYPE_INT, 4, NULL);
+ "mpegversion", G_TYPE_INT, 4, "framed", G_TYPE_BOOLEAN, TRUE, NULL);
codec_name = "AAC";
break;
case 7: