mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/gsm/gstgsmdec.c: Fix capsnego, simplify chain function slightly.

Browse source 
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.
This commit is contained in:
Ronald S. Bultje 2004-04-19 02:00:24 +00:00
parent 2cb68dcdc1
commit 2d0b40d77c
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2004-04-18 Ronald Bultje <rbultje@ronald.bitfreak.net>
* 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.
2004-04-18 Ronald Bultje <rbultje@ronald.bitfreak.net> 2004-04-18 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst/wavparse/gstwavparse.c: (gst_wavparse_init), * gst/wavparse/gstwavparse.c: (gst_wavparse_init),

4
gst/qtdemux/qtdemux.c
View file

@ -2031,6 +2031,8 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, guint32 fourcc, const guint8 * data)
"bitrate", G_TYPE_INT, QTDEMUX_GUINT32_GET (data + 40), "bitrate", G_TYPE_INT, QTDEMUX_GUINT32_GET (data + 40),
"blocksize", G_TYPE_INT, QTDEMUX_GUINT32_GET (data + 44), NULL); "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', 't', 'v', 'r'):
/* ? */ /* ? */
case GST_MAKE_FOURCC ('Q', 'D', 'M', 'C'): 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 */ /* IMA 4:1 */
case GST_MAKE_FOURCC ('Q', 'c', 'l', 'p'): case GST_MAKE_FOURCC ('Q', 'c', 'l', 'p'):
/* QUALCOMM PureVoice */ /* QUALCOMM PureVoice */
case GST_MAKE_FOURCC ('a', 'g', 's', 'm'):
/* ? */
default: default:
g_critical ("Don't know how to convert fourcc '" GST_FOURCC_FORMAT g_critical ("Don't know how to convert fourcc '" GST_FOURCC_FORMAT
"' to caps\n", GST_FOURCC_ARGS (fourcc)); "' to caps\n", GST_FOURCC_ARGS (fourcc));