summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
Diffstat (limited to 'gst')
-rw-r--r--gst/deinterlace/gstdeinterlace.c2
-rw-r--r--gst/deinterlace/gstdeinterlace.h13
-rw-r--r--gst/festival/gstfestival.c2
-rw-r--r--gst/filter/gstbpwsinc.c2
-rw-r--r--gst/filter/gstiir.c2
-rw-r--r--gst/filter/gstlpwsinc.c2
-rw-r--r--gst/flx/gstflxdec.c2
-rw-r--r--gst/mixmatrix/mixmatrix.c2
-rw-r--r--gst/modplug/gstmodplug.cc2
-rw-r--r--gst/mpeg1videoparse/gstmp1videoparse.c2
-rw-r--r--gst/mpeg2sub/gstmpeg2subt.c2
-rw-r--r--gst/mpegaudioparse/gstmpegaudioparse.c2
-rw-r--r--gst/overlay/gstoverlay.c2
-rw-r--r--gst/passthrough/gstpassthrough.c2
-rw-r--r--gst/passthrough/gstpassthrough.h16
-rw-r--r--gst/rtjpeg/gstrtjpegdec.c2
-rw-r--r--gst/rtjpeg/gstrtjpegenc.c2
-rw-r--r--gst/smooth/gstsmooth.c2
-rw-r--r--gst/smpte/gstsmpte.c2
-rw-r--r--gst/spectrum/gstspectrum.c2
-rw-r--r--gst/speed/gstspeed.c2
-rw-r--r--gst/stereo/gststereo.c4
-rw-r--r--gst/vbidec/gstvbidec.c2
-rw-r--r--gst/videocrop/gstvideocrop.c2
-rw-r--r--gst/videodrop/gstvideodrop.c2
-rw-r--r--gst/y4m/gsty4mencode.c2
26 files changed, 32 insertions, 47 deletions
diff --git a/gst/deinterlace/gstdeinterlace.c b/gst/deinterlace/gstdeinterlace.c
index 9b1b512f..7411b543 100644
--- a/gst/deinterlace/gstdeinterlace.c
+++ b/gst/deinterlace/gstdeinterlace.c
@@ -29,7 +29,7 @@
/* elementfactory information */
static GstElementDetails deinterlace_details = GST_ELEMENT_DETAILS (
"Deinterlace",
- "Filter/Video",
+ "Filter/Effect/Video",
"Deinterlace video",
"Wim Taymans <wim.taymans@chello.be>"
);
diff --git a/gst/deinterlace/gstdeinterlace.h b/gst/deinterlace/gstdeinterlace.h
index 45eda04a..27207319 100644
--- a/gst/deinterlace/gstdeinterlace.h
+++ b/gst/deinterlace/gstdeinterlace.h
@@ -25,11 +25,7 @@
#include <gst/gst.h>
/* #include <gst/meta/audioraw.h> */
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
#define GST_TYPE_DEINTERLACE \
(gst_deinterlace_get_type())
@@ -67,9 +63,6 @@ struct _GstDeInterlaceClass {
GstElementClass parent_class;
};
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
-#endif /* __GST_STEREO_H__ */
+#endif /* __GST_DEINTERLACE_H__ */
diff --git a/gst/festival/gstfestival.c b/gst/festival/gstfestival.c
index e8e11e67..71e97e52 100644
--- a/gst/festival/gstfestival.c
+++ b/gst/festival/gstfestival.c
@@ -92,7 +92,7 @@ static char* client_accept_s_expr (int fd);
/* elementfactory information */
static GstElementDetails gst_festival_details = GST_ELEMENT_DETAILS (
"Festival synthesizer",
- "Filter/Audio",
+ "Filter/Effect/Audio",
"Synthesizes plain text into audio",
"Wim Taymans <wim.taymans@chello.be>"
);
diff --git a/gst/filter/gstbpwsinc.c b/gst/filter/gstbpwsinc.c
index fe721f39..c7144621 100644
--- a/gst/filter/gstbpwsinc.c
+++ b/gst/filter/gstbpwsinc.c
@@ -41,7 +41,7 @@
/* elementfactory information */
static GstElementDetails gst_bpwsinc_details = GST_ELEMENT_DETAILS (
"BPWSinc",
- "Filter/Audio/Effect",
+ "Filter/Effect/Audio",
"Band-Pass Windowed sinc filter",
"Thomas <thomas@apestaart.org>, "
"Steven W. Smith"
diff --git a/gst/filter/gstiir.c b/gst/filter/gstiir.c
index 185b1522..007bdb7a 100644
--- a/gst/filter/gstiir.c
+++ b/gst/filter/gstiir.c
@@ -27,7 +27,7 @@
static GstElementDetails gst_iir_details = GST_ELEMENT_DETAILS (
"IIR",
- "Filter/Audio/Effect",
+ "Filter/Effect/Audio",
"IIR filter based on vorbis code",
"Monty <monty@xiph.org>, "
"Thomas <thomas@apestaart.org>"
diff --git a/gst/filter/gstlpwsinc.c b/gst/filter/gstlpwsinc.c
index 1ed5078d..aaa7463e 100644
--- a/gst/filter/gstlpwsinc.c
+++ b/gst/filter/gstlpwsinc.c
@@ -40,7 +40,7 @@
static GstElementDetails gst_lpwsinc_details = GST_ELEMENT_DETAILS (
"LPWSinc",
- "Filter/Audio/Effect",
+ "Filter/Effect/Audio",
"Low-pass Windowed sinc filter",
"Thomas <thomas@apestaart.org>, "
"Steven W. Smith"
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
index 7140067d..6a8a6101 100644
--- a/gst/flx/gstflxdec.c
+++ b/gst/flx/gstflxdec.c
@@ -31,7 +31,7 @@
/* flx element information */
static GstElementDetails flxdec_details = {
"FLX Decoder",
- "Codec/Audio/Decoder",
+ "Codec/Decoder/Audio",
"FLX decoder",
"Sepp Wijnands <mrrazz@garbage-coderz.net>"
};
diff --git a/gst/mixmatrix/mixmatrix.c b/gst/mixmatrix/mixmatrix.c
index 9cc2a416..bcaea0fd 100644
--- a/gst/mixmatrix/mixmatrix.c
+++ b/gst/mixmatrix/mixmatrix.c
@@ -68,7 +68,7 @@ struct _GstMixMatrixClass {
/* elementfactory information */
static GstElementDetails mixmatrix_details = {
"Mixing Matrix",
- "Filter/Audio",
+ "Filter/Editor/Audio",
"Mix N audio channels together into M channels",
"Erik Walthinsen <omega@temple-baptist.com>"
};
diff --git a/gst/modplug/gstmodplug.cc b/gst/modplug/gstmodplug.cc
index 4ac6bc4e..a5dc19c7 100644
--- a/gst/modplug/gstmodplug.cc
+++ b/gst/modplug/gstmodplug.cc
@@ -41,7 +41,7 @@
/* elementfactory information */
GstElementDetails modplug_details = {
"ModPlug",
- "Codec/Audio/Decoder",
+ "Codec/Decoder/Audio",
"Module decoder based on modplug engine",
"Jeremy SIMON <jsimon13@yahoo.fr>"
};
diff --git a/gst/mpeg1videoparse/gstmp1videoparse.c b/gst/mpeg1videoparse/gstmp1videoparse.c
index 0928c5e0..3f5aa3dd 100644
--- a/gst/mpeg1videoparse/gstmp1videoparse.c
+++ b/gst/mpeg1videoparse/gstmp1videoparse.c
@@ -38,7 +38,7 @@
/* elementfactory information */
static GstElementDetails mpeg1videoparse_details = GST_ELEMENT_DETAILS (
"MPEG 1 Video Parser",
- "Codec/Parser",
+ "Codec/Parser/Video",
"Parses and frames MPEG 1 video streams, provides seek",
"Wim Taymans <wim.taymans@chello.be>"
);
diff --git a/gst/mpeg2sub/gstmpeg2subt.c b/gst/mpeg2sub/gstmpeg2subt.c
index c81d7b31..46681c6e 100644
--- a/gst/mpeg2sub/gstmpeg2subt.c
+++ b/gst/mpeg2sub/gstmpeg2subt.c
@@ -39,7 +39,7 @@ static void gst_mpeg2subt_get_property (GObject *object, guint prop_id, GValue
/* elementfactory information */
static GstElementDetails mpeg2subt_details = {
"MPEG2 subtitle Decoder",
- "Codec/Video/Decoder",
+ "Codec/Decoder/Video",
"Decodes and merges MPEG2 subtitles into a video frame",
"Wim Taymans <wim.taymans@chello.be>"
};
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index 8675d62f..3a1c067d 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -27,7 +27,7 @@
/* elementfactory information */
static GstElementDetails mp3parse_details = {
"MPEG1 Audio Parser",
- "Codec/Parser",
+ "Codec/Parser/Audio",
"Parses and frames mpeg1 audio streams (levels 1-3), provides seek",
"Erik Walthinsen <omega@cse.ogi.edu>"
};
diff --git a/gst/overlay/gstoverlay.c b/gst/overlay/gstoverlay.c
index a2d799ec..8410714e 100644
--- a/gst/overlay/gstoverlay.c
+++ b/gst/overlay/gstoverlay.c
@@ -26,7 +26,7 @@
/* elementfactory information */
static GstElementDetails overlay_details = {
"Video Overlay",
- "Filter/Video",
+ "Filter/Editor/Video",
"Overlay multiple video streams",
"David Schleef <ds@schleef.org>"
};
diff --git a/gst/passthrough/gstpassthrough.c b/gst/passthrough/gstpassthrough.c
index 351a3426..9942a758 100644
--- a/gst/passthrough/gstpassthrough.c
+++ b/gst/passthrough/gstpassthrough.c
@@ -32,7 +32,7 @@
/* elementfactory information */
static GstElementDetails passthrough_details = {
"Passthrough",
- "Filter/Audio/Effect",
+ "Filter/Effect/Audio",
"Transparent filter for audio/raw (boilerplate for effects)",
"Thomas <thomas@apestaart.org>, "\
"Andy Wingo <apwingo@eos.ncsu.edu>"
diff --git a/gst/passthrough/gstpassthrough.h b/gst/passthrough/gstpassthrough.h
index fd4c2445..7d0119b2 100644
--- a/gst/passthrough/gstpassthrough.h
+++ b/gst/passthrough/gstpassthrough.h
@@ -22,14 +22,9 @@
#ifndef __GST_PASSTHROUGH_H__
#define __GST_PASSTHROUGH_H__
-
#include <gst/gst.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
#define GST_TYPE_PASSTHROUGH \
(gst_passthrough_get_type())
@@ -65,11 +60,11 @@ struct _GstPassthrough {
guint channels;
guint width;
guint endianness;
+ guint buffer_size;
- /* the next are valid only for format==GST_PASSTHROUGH_FORMAT_INT */
+ /* the next are valid only for int formats */
guint depth;
gboolean is_signed;
-
};
struct _GstPassthroughClass {
@@ -78,9 +73,6 @@ struct _GstPassthroughClass {
GType gst_passthrough_get_type(void);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
#endif /* __GST_PASSTHROUGH_H__ */
diff --git a/gst/rtjpeg/gstrtjpegdec.c b/gst/rtjpeg/gstrtjpegdec.c
index ab87a36e..7173c132 100644
--- a/gst/rtjpeg/gstrtjpegdec.c
+++ b/gst/rtjpeg/gstrtjpegdec.c
@@ -28,7 +28,7 @@
/* elementfactory information */
GstElementDetails gst_rtjpegdec_details = {
"RTjpeg decoder",
- "Codec/Video/Decoder",
+ "Codec/Decoder/Video",
"Decodes video in RTjpeg format",
"Erik Walthinsen <omega@cse.ogi.edu>"
};
diff --git a/gst/rtjpeg/gstrtjpegenc.c b/gst/rtjpeg/gstrtjpegenc.c
index 1ff510bc..d562471a 100644
--- a/gst/rtjpeg/gstrtjpegenc.c
+++ b/gst/rtjpeg/gstrtjpegenc.c
@@ -26,7 +26,7 @@
/* elementfactory information */
GstElementDetails gst_rtjpegenc_details = {
"RTjpeg encoder",
- "Codec/Video/Encoder",
+ "Codec/Encoder/Video",
"Encodes video in RTjpeg format",
"Erik Walthinsen <omega@cse.ogi.edu>"
};
diff --git a/gst/smooth/gstsmooth.c b/gst/smooth/gstsmooth.c
index 285b02de..4455c74f 100644
--- a/gst/smooth/gstsmooth.c
+++ b/gst/smooth/gstsmooth.c
@@ -27,7 +27,7 @@
/* elementfactory information */
static GstElementDetails smooth_details = {
"Smooth effect",
- "Filter/Video",
+ "Filter/Effect/Video",
"Apply a smooth filter to an image",
"Wim Taymans <wim.taymans@chello.be>"
};
diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c
index 6e38dcb0..de485105 100644
--- a/gst/smpte/gstsmpte.c
+++ b/gst/smpte/gstsmpte.c
@@ -28,7 +28,7 @@
/* elementfactory information */
static GstElementDetails smpte_details = {
"SMPTE transitions",
- "Filter/Video",
+ "Filter/Editor/Video",
"Apply the standard SMPTE transitions on video images",
"Wim Taymans <wim.taymans@chello.be>"
};
diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c
index eab15fe1..4b45ad7b 100644
--- a/gst/spectrum/gstspectrum.c
+++ b/gst/spectrum/gstspectrum.c
@@ -27,7 +27,7 @@
/* elementfactory information */
static GstElementDetails gst_spectrum_details = GST_ELEMENT_DETAILS (
"Spectrum analyzer",
- "Filter/Audio/Analysis",
+ "Filter/Analyzer/Audio",
"Run an FFT on the audio signal, output spectrum data",
"Erik Walthinsen <omega@cse.ogi.edu>"
);
diff --git a/gst/speed/gstspeed.c b/gst/speed/gstspeed.c
index 9fa1c7cf..a8894075 100644
--- a/gst/speed/gstspeed.c
+++ b/gst/speed/gstspeed.c
@@ -38,7 +38,7 @@
/* elementfactory information */
static GstElementDetails speed_details = GST_ELEMENT_DETAILS (
"Speed",
- "Filter/Audio/Effect",
+ "Filter/Effect/Audio",
"Set speed/pitch on audio/raw streams (resampler)",
"Andy Wingo <apwingo@eos.ncsu.edu>"
);
diff --git a/gst/stereo/gststereo.c b/gst/stereo/gststereo.c
index cb8ff0dd..0e315c7c 100644
--- a/gst/stereo/gststereo.c
+++ b/gst/stereo/gststereo.c
@@ -30,8 +30,8 @@
/* elementfactory information */
static GstElementDetails stereo_details = GST_ELEMENT_DETAILS (
"Stereo effect",
- "Filter/Audio/Effect",
- "Muck with the stereo signal, enhance it's 'stereo-ness'",
+ "Filter/Effect/Audio",
+ "Muck with the stereo signal to enhance its 'stereo-ness'",
"Erik Walthinsen <omega@cse.ogi.edu>"
);
diff --git a/gst/vbidec/gstvbidec.c b/gst/vbidec/gstvbidec.c
index f84533db..f3c68534 100644
--- a/gst/vbidec/gstvbidec.c
+++ b/gst/vbidec/gstvbidec.c
@@ -65,7 +65,7 @@ GType gst_vbidec_get_type(void);
/* elementfactory information */
static GstElementDetails gst_vbidec_details = GST_ELEMENT_DETAILS (
"VBI decoder",
- "Codec/Video/Decoder",
+ "Codec/Decoder/Video",
"Decodes closed captions and XDS data from VBI data",
"David I. Lehn <dlehn@users.sourceforge.net>"
);
diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c
index 666e5578..d96a6c53 100644
--- a/gst/videocrop/gstvideocrop.c
+++ b/gst/videocrop/gstvideocrop.c
@@ -59,7 +59,7 @@ struct _GstVideoCropClass {
/* elementfactory information */
static GstElementDetails gst_video_crop_details = GST_ELEMENT_DETAILS (
"video crop filter",
- "Filter/Video",
+ "Filter/Effect/Video",
"Crops video into a user defined region",
"Wim Taymans <wim.taymans@chello.be>"
);
diff --git a/gst/videodrop/gstvideodrop.c b/gst/videodrop/gstvideodrop.c
index 77842637..3de45574 100644
--- a/gst/videodrop/gstvideodrop.c
+++ b/gst/videodrop/gstvideodrop.c
@@ -26,7 +26,7 @@
/* elementfactory information */
static GstElementDetails videodrop_details = GST_ELEMENT_DETAILS (
"Video frame dropper",
- "Filter/Video",
+ "Filter/Effect/Video",
"Re-FPS'es video",
"Ronald Bultje <rbultje@ronald.bitfreak.net>"
);
diff --git a/gst/y4m/gsty4mencode.c b/gst/y4m/gsty4mencode.c
index 6870222f..4da88e38 100644
--- a/gst/y4m/gsty4mencode.c
+++ b/gst/y4m/gsty4mencode.c
@@ -28,7 +28,7 @@
static GstElementDetails y4mencode_details = GST_ELEMENT_DETAILS (
"Y4mEncode",
- "Codec/Video/Encoder",
+ "Codec/Encoder/Video",
"Encodes a YUV frame into the yuv4mpeg format (mjpegtools)",
"Wim Taymans <wim.taymans@chello.be>"
);