diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-07-15 23:56:05 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-07-15 23:56:05 +0000 |
| commit | fe3d02a6ca570c71ddf68bde3ceb543de061f2ca (patch) | |
| tree | 485c23124ee64d99fb715755ad1a59d541c07096 /sys/oss | |
| parent | b86a1d2e7c3b2a78a3bbd95c572b9a1511bd3529 (diff) | |
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.
Diffstat (limited to 'sys/oss')
| -rw-r--r-- | sys/oss/gstossmixer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/oss/gstossmixer.c b/sys/oss/gstossmixer.c index 274d1205..0ee0ee10 100644 --- a/sys/oss/gstossmixer.c +++ b/sys/oss/gstossmixer.c @@ -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) |