diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-08-09 00:14:42 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-08-09 00:14:42 -0400 |
| commit | af3f7e7f20eaf961f4384940ec6ad987bb0afbb6 (patch) | |
| tree | c42a7ad4f2dea47dd645a729a6ee0399bd80cfb1 /gst/qtmux | |
| parent | adadf06b0a9e26005ba9363aa0049dc0b740c94d (diff) | |
| parent | dd5afbf0c6557ad89994cbfd91e4117e8503b81a (diff) | |
| download | gst-plugins-bad-af3f7e7f20eaf961f4384940ec6ad987bb0afbb6.tar.gz gst-plugins-bad-af3f7e7f20eaf961f4384940ec6ad987bb0afbb6.tar.bz2 gst-plugins-bad-af3f7e7f20eaf961f4384940ec6ad987bb0afbb6.zip | |
Merge branch 'fdo' into lv2
Diffstat (limited to 'gst/qtmux')
| -rw-r--r-- | gst/qtmux/gstqtmux.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gst/qtmux/gstqtmux.c b/gst/qtmux/gstqtmux.c index ba155f6a..f1001966 100644 --- a/gst/qtmux/gstqtmux.c +++ b/gst/qtmux/gstqtmux.c @@ -1553,10 +1553,16 @@ gst_qt_mux_audio_sink_set_caps (GstPad * pad, GstCaps * caps) if (!gst_structure_get_int (structure, "width", &width) || !gst_structure_get_int (structure, "depth", &depth) || - !gst_structure_get_boolean (structure, "signed", &sign) || - !gst_structure_get_int (structure, "endianness", &endianness)) { - GST_DEBUG_OBJECT (qtmux, - "broken caps, width/depth/signed/endianness field missing"); + !gst_structure_get_boolean (structure, "signed", &sign)) { + GST_DEBUG_OBJECT (qtmux, "broken caps, width/depth/signed field missing"); + goto refuse_caps; + } + + if (depth <= 8) { + endianness = G_BYTE_ORDER; + } else if (!gst_structure_get_boolean (structure, + "endianness", &endianness)) { + GST_DEBUG_OBJECT (qtmux, "broken caps, endianness field missing"); goto refuse_caps; } |