summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Munro <imunro@netspace.net.au>2007-07-30 09:52:36 +0000
committerTim-Philipp Müller <tim@centricular.net>2007-07-30 09:52:36 +0000
commit78a7ce11d93c81e193d1b258fd0f1bffa0ba3686 (patch)
treeb3ca77e2863529bd4ef81854d2d70c69cb157e4e
parent1b0a8436b41ad0925c99ccbb982e6911fd56a986 (diff)
downloadgst-plugins-bad-78a7ce11d93c81e193d1b258fd0f1bffa0ba3686.tar.gz
gst-plugins-bad-78a7ce11d93c81e193d1b258fd0f1bffa0ba3686.tar.bz2
gst-plugins-bad-78a7ce11d93c81e193d1b258fd0f1bffa0ba3686.zip
gst/bayer/gstbayer2rgb.c: Include our own "_stdint.h" instead of <stdint.h> (which may not be available).
Original commit message from CVS: Patch by: Ian Munro <imunro at netspace net au> * gst/bayer/gstbayer2rgb.c: Include our own "_stdint.h" instead of <stdint.h> (which may not be available). * gst/speed/gstspeed.h: Native HP-UX compiler dosn't seem to like enum typedefs before the actual enum was defined. * gst/vmnc/vmncdec.c: Fix wrong usage of GST_ELEMENT_ERROR macro (#461373).
-rw-r--r--ChangeLog15
-rw-r--r--gst/bayer/gstbayer2rgb.c2
-rw-r--r--gst/speed/gstspeed.h3
-rw-r--r--gst/vmnc/vmncdec.c2
4 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d5f7bc63..ecd41235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-07-30 Tim-Philipp Müller <tim at centricular dot net>
+
+ Patch by: Ian Munro <imunro at netspace net au>
+
+ * gst/bayer/gstbayer2rgb.c:
+ Include our own "_stdint.h" instead of <stdint.h> (which may not
+ be available).
+
+ * gst/speed/gstspeed.h:
+ Native HP-UX compiler dosn't seem to like enum typedefs before the
+ actual enum was defined.
+
+ * gst/vmnc/vmncdec.c:
+ Fix wrong usage of GST_ELEMENT_ERROR macro (#461373).
+
2007-07-26 Edward Hervey <bilboed@bilboed.com>
* gst/real/gstrealaudiodec.c: (gst_real_audio_dec_setcaps):
diff --git a/gst/bayer/gstbayer2rgb.c b/gst/bayer/gstbayer2rgb.c
index 7c278869..f1f3f7fb 100644
--- a/gst/bayer/gstbayer2rgb.c
+++ b/gst/bayer/gstbayer2rgb.c
@@ -32,7 +32,7 @@
#include <gst/base/gstbasetransform.h>
#include <gst/video/video.h>
#include <string.h>
-#include <stdint.h>
+#include "_stdint.h"
#define GST_CAT_DEFAULT gst_bayer2rgb_debug
GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
diff --git a/gst/speed/gstspeed.h b/gst/speed/gstspeed.h
index 1ec737b1..19b5c36c 100644
--- a/gst/speed/gstspeed.h
+++ b/gst/speed/gstspeed.h
@@ -39,13 +39,14 @@ G_BEGIN_DECLS
typedef struct _GstSpeed GstSpeed;
typedef struct _GstSpeedClass GstSpeedClass;
-typedef enum _GstSpeedFormat GstSpeedFormat;
enum _GstSpeedFormat {
GST_SPEED_FORMAT_INT,
GST_SPEED_FORMAT_FLOAT
};
+typedef enum _GstSpeedFormat GstSpeedFormat;
+
struct _GstSpeed {
GstElement element;
diff --git a/gst/vmnc/vmncdec.c b/gst/vmnc/vmncdec.c
index 701b18e9..e6c6f8ae 100644
--- a/gst/vmnc/vmncdec.c
+++ b/gst/vmnc/vmncdec.c
@@ -993,7 +993,7 @@ vmnc_dec_chain_frame (GstVMncDec * dec, GstBuffer * inbuf,
if (res < 0) {
ret = GST_FLOW_ERROR;
- GST_ELEMENT_ERROR (dec, STREAM, DECODE, NULL, ("Couldn't decode packet"));
+ GST_ELEMENT_ERROR (dec, STREAM, DECODE, (NULL), ("Couldn't decode packet"));
} else {
GST_DEBUG_OBJECT (dec, "read %d bytes of %d", res, len);
/* inbuf may be NULL; that's ok */