mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 08:17:01 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/mpeg2enc/gstmpeg2enc.cc: Define LOG_NONE and friends if they're not defined yet. mjpegtools 1.9.0rc3 removed thei...

Browse source 
Original commit message from CVS:
* 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.
This commit is contained in:
Sebastian Dröge 2008-01-29 18:05:01 +00:00
parent 1042491064
commit de592925a7
2 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 2008-01-29 Stefan Kost <ensonic@users.sf.net>
* docs/plugins/gst-plugins-bad-plugins-docs.sgml: * docs/plugins/gst-plugins-bad-plugins-docs.sgml:

24
ext/mpeg2enc/gstmpeg2enc.cc
View file

@ -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_finalize (GObject * object);
static void gst_mpeg2enc_reset (GstMpeg2enc * enc); static void gst_mpeg2enc_reset (GstMpeg2enc * enc);
static gboolean gst_mpeg2enc_setcaps (GstPad * pad, GstCaps * caps); static gboolean gst_mpeg2enc_setcaps (GstPad * pad, GstCaps * caps);
@ -650,6 +673,7 @@ done:
static mjpeg_log_handler_t old_handler = NULL; static mjpeg_log_handler_t old_handler = NULL;
/* note that this will affect all mjpegtools elements/threads */ /* note that this will affect all mjpegtools elements/threads */
static void static void
gst_mpeg2enc_log_callback (log_level_t level, const char *message) gst_mpeg2enc_log_callback (log_level_t level, const char *message)
{ {