diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-04-19 02:00:24 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-04-19 02:00:24 +0000 |
| commit | 47e43d5a7e45a73ad2f64fbd924dc992ca3ede4d (patch) | |
| tree | b7e56359678223175b86592c1b27657a35a3a743 /gst | |
| parent | f3acf1d3eb081efba18de0dc0ee408994109840c (diff) | |
| download | gst-plugins-bad-47e43d5a7e45a73ad2f64fbd924dc992ca3ede4d.tar.gz gst-plugins-bad-47e43d5a7e45a73ad2f64fbd924dc992ca3ede4d.tar.bz2 gst-plugins-bad-47e43d5a7e45a73ad2f64fbd924dc992ca3ede4d.zip | |
ext/gsm/gstgsmdec.c: Fix capsnego, simplify chain function slightly.
Original commit message from CVS:
* ext/gsm/gstgsmdec.c: (gst_gsmdec_init), (gst_gsmdec_getcaps),
(gst_gsmdec_link), (gst_gsmdec_chain):
Fix capsnego, simplify chain function slightly.
* gst/qtdemux/qtdemux.c: (qtdemux_audio_caps):
Add GSM.
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 3303c6c9..21fe6284 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -2031,6 +2031,8 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, guint32 fourcc, const guint8 * data) "bitrate", G_TYPE_INT, QTDEMUX_GUINT32_GET (data + 40), "blocksize", G_TYPE_INT, QTDEMUX_GUINT32_GET (data + 44), NULL); } + case GST_MAKE_FOURCC ('a', 'g', 's', 'm'): + return gst_caps_new_simple ("audio/x-gsm", NULL); case GST_MAKE_FOURCC ('q', 't', 'v', 'r'): /* ? */ case GST_MAKE_FOURCC ('Q', 'D', 'M', 'C'): @@ -2039,8 +2041,6 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, guint32 fourcc, const guint8 * data) /* IMA 4:1 */ case GST_MAKE_FOURCC ('Q', 'c', 'l', 'p'): /* QUALCOMM PureVoice */ - case GST_MAKE_FOURCC ('a', 'g', 's', 'm'): - /* ? */ default: g_critical ("Don't know how to convert fourcc '" GST_FOURCC_FORMAT "' to caps\n", GST_FOURCC_ARGS (fourcc)); |