diff options
| author | David Schleef <ds@schleef.org> | 2004-01-15 21:05:17 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2004-01-15 21:05:17 +0000 |
| commit | 1536c982d271171045d219ed3b4db9297e9264d0 (patch) | |
| tree | 0f013d00ac1ebb426f2c7f370bf5f9007db83fdb /gst/qtdemux/qtdemux.c | |
| parent | f376bd1d93217757853e2b584418278d71b90a9d (diff) | |
| download | gst-plugins-bad-1536c982d271171045d219ed3b4db9297e9264d0.tar.gz gst-plugins-bad-1536c982d271171045d219ed3b4db9297e9264d0.tar.bz2 gst-plugins-bad-1536c982d271171045d219ed3b4db9297e9264d0.zip | |
ext/esd/esdsink.c: Remove property that handles osssink fallback.
Original commit message from CVS:
* ext/esd/esdsink.c: (gst_esdsink_class_init): Remove property
that handles osssink fallback.
* gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_init),
(gst_audio_convert_getcaps):
* gst/qtdemux/qtdemux.c: (qtdemux_audio_caps):
Add audio/x-qdm2 for QDM2 audio.
* gst/sine/gstsinesrc.c: (gst_sinesrc_get):
* gst/sine/gstsinesrc.h: Add example of how to implement tags.
* gst/videoscale/gstvideoscale.c: (gst_videoscale_getcaps):
Decrease minimum size to 16x16.
* gst/wavparse/gstwavparse.c:
Convert disabled pad template caps to new caps.
* sys/ximage/ximagesink.c: (gst_ximagesink_xcontext_get):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_xcontext_get),
(gst_xvimagesink_chain): Throw element error when display cannot
be opened. Increase minimum framerate to 1.0. Check the data
free function on a buffer to make sure it is the type we expect
before manipulating it.
Diffstat (limited to 'gst/qtdemux/qtdemux.c')
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index cf9bd351..e950d681 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -1632,10 +1632,11 @@ static GstCaps *qtdemux_audio_caps(GstQTDemux *qtdemux, guint32 fourcc) /* MPEG-4 AAC */ return gst_caps_from_string ("audio/mpeg, " "mpegversion = (int) 4"); - case GST_MAKE_FOURCC('q','t','v','r'): - /* ? */ case GST_MAKE_FOURCC('Q','D','M','2'): /* QDesign music version 2 (no constant) */ + return gst_caps_from_string ("audio/x-qdm2"); + case GST_MAKE_FOURCC('q','t','v','r'): + /* ? */ case GST_MAKE_FOURCC('Q','D','M','C'): /* QDesign music */ case GST_MAKE_FOURCC('i','m','a','4'): |