diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-04-29 13:56:07 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-04-29 13:56:07 +0200 |
| commit | 87e9e529e731633ce3950f1154405d9b0b4d2ab4 (patch) | |
| tree | 9481a29ea95f9dbe0fb7f950171d9925b91d47d8 /gst | |
| parent | c741c2cd59857311123c57ec354b2534460eceaa (diff) | |
| download | gst-plugins-bad-87e9e529e731633ce3950f1154405d9b0b4d2ab4.tar.gz gst-plugins-bad-87e9e529e731633ce3950f1154405d9b0b4d2ab4.tar.bz2 gst-plugins-bad-87e9e529e731633ce3950f1154405d9b0b4d2ab4.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.c | 4 | ||||
| -rw-r--r-- | gst/flv/gstflvparse.c | 2 |
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: |