mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-26 17:18:15 +00:00
gst-libs/gst/riff/riff-media.c: mp42/mp43 (no caps) exist too.
Original commit message from CVS: * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps_with_data): mp42/mp43 (no caps) exist too. * gst/matroska/matroska-demux.c: (gst_matroska_demux_video_caps): Set pixel_width/height; we've got them in-caps. * gst/typefind/gsttypefindfunctions.c: (plugin_init): * gst/wavparse/gstwavparse.c: (plugin_init): Both are valid primary. * sys/oss/gstossmixer.c: Remove i18n hack and enable translations.
This commit is contained in:
parent
b86a1d2e7c
commit
fe3d02a6ca
4 changed files with 23 additions and 6 deletions
13
ChangeLog
13
ChangeLog
|
@ -1,3 +1,16 @@
|
|||
2004-07-15 Ronald Bultje <rbultje@ronald.bitfreak.net>
|
||||
|
||||
* gst-libs/gst/riff/riff-media.c:
|
||||
(gst_riff_create_video_caps_with_data):
|
||||
mp42/mp43 (no caps) exist too.
|
||||
* gst/matroska/matroska-demux.c: (gst_matroska_demux_video_caps):
|
||||
Set pixel_width/height; we've got them in-caps.
|
||||
* gst/typefind/gsttypefindfunctions.c: (plugin_init):
|
||||
* gst/wavparse/gstwavparse.c: (plugin_init):
|
||||
Both are valid primary.
|
||||
* sys/oss/gstossmixer.c:
|
||||
Remove i18n hack and enable translations.
|
||||
|
||||
2004-07-15 Benjamin Otte <otte@gnome.org>
|
||||
|
||||
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls),
|
||||
|
|
|
@ -2445,7 +2445,7 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext * videocontext,
|
|||
"width", GST_TYPE_INT_RANGE, 16, 4096,
|
||||
"height", GST_TYPE_INT_RANGE, 16, 4096, NULL);
|
||||
}
|
||||
#if 0
|
||||
|
||||
if (videocontext->display_width > 0 && videocontext->display_height > 0) {
|
||||
gint w =
|
||||
100 * videocontext->display_width / videocontext->pixel_width;
|
||||
|
@ -2455,8 +2455,12 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext * videocontext,
|
|||
gst_structure_set (structure,
|
||||
"pixel_width", G_TYPE_INT, w,
|
||||
"pixel_height", G_TYPE_INT, h, NULL);
|
||||
} else {
|
||||
gst_structure_set (structure,
|
||||
"pixel_width", G_TYPE_INT, 1,
|
||||
"pixel_height", G_TYPE_INT, 1, NULL);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (context->default_duration > 0) {
|
||||
gfloat framerate = 1. * GST_SECOND / context->default_duration;
|
||||
|
||||
|
|
|
@ -966,7 +966,7 @@ plugin_init (GstPlugin * plugin)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
return gst_element_register (plugin, "wavparse", GST_RANK_SECONDARY,
|
||||
return gst_element_register (plugin, "wavparse", GST_RANK_PRIMARY,
|
||||
GST_TYPE_WAVPARSE);
|
||||
}
|
||||
|
||||
|
|
|
@ -45,6 +45,8 @@
|
|||
|
||||
#endif /* HAVE_OSS_INCLUDE_IN_SYS */
|
||||
|
||||
#include <gst/gst-i18n-plugin.h>
|
||||
|
||||
#include "gstossmixer.h"
|
||||
|
||||
#define MASK_BIT_IS_SET(mask, bit) \
|
||||
|
@ -73,11 +75,9 @@ static GstMixerTrackClass *parent_class = NULL;
|
|||
/* three functions: firstly, OSS has the nasty habit of inserting
|
||||
* spaces in the labels, we want to get rid of them. Secondly,
|
||||
* i18n is impossible with OSS' way of providing us with mixer
|
||||
* labels, so we make a 'given' list of i18n'ed labels. Since
|
||||
* i18n doesn't actually work, we fake it (FIXME). Thirdly, I
|
||||
* labels, so we make a 'given' list of i18n'ed labels. Thirdly, I
|
||||
* personally don't like the "1337" names that OSS gives to their
|
||||
* labels ("Vol", "Mic", "Rec"), I'd rather see full names. */
|
||||
#define _(s) s
|
||||
|
||||
static void
|
||||
fill_labels (void)
|
||||
|
|
Loading…
Reference in a new issue