summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ext/mpeg2enc/gstmpeg2enc.cc24
2 files changed, 31 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 298af486..9ce784e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-29 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * ext/mpeg2enc/gstmpeg2enc.cc:
+ Define LOG_NONE and friends if they're not defined yet. mjpegtools
+ 1.9.0rc3 removed their definitions but without it doesn't make much
+ sense to write a log handler.
+
2008-01-29 Stefan Kost <ensonic@users.sf.net>
* docs/plugins/gst-plugins-bad-plugins-docs.sgml:
diff --git a/ext/mpeg2enc/gstmpeg2enc.cc b/ext/mpeg2enc/gstmpeg2enc.cc
index 6ba9cde9..4c9d6ebf 100644
--- a/ext/mpeg2enc/gstmpeg2enc.cc
+++ b/ext/mpeg2enc/gstmpeg2enc.cc
@@ -91,6 +91,29 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
);
+
+/* Workaround against stupid removal of the log_level_t enum in 1.9.0rc3.
+ * Without it doesn't make much sense to implement a mjpeg_log_handler_t */
+#ifndef LOG_NONE
+#define LOG_NONE 0
+#endif
+
+#ifndef LOG_DEBUG
+#define LOG_DEBUG 1
+#endif
+
+#ifndef LOG_INFO
+#define LOG_INFO 2
+#endif
+
+#ifndef LOG_WARN
+#define LOG_WARN 3
+#endif
+
+#ifndef LOG_ERROR
+#define LOG_ERROR 4
+#endif
+
static void gst_mpeg2enc_finalize (GObject * object);
static void gst_mpeg2enc_reset (GstMpeg2enc * enc);
static gboolean gst_mpeg2enc_setcaps (GstPad * pad, GstCaps * caps);
@@ -650,6 +673,7 @@ done:
static mjpeg_log_handler_t old_handler = NULL;
/* note that this will affect all mjpegtools elements/threads */
+
static void
gst_mpeg2enc_log_callback (log_level_t level, const char *message)
{