From 646ac4cdf2054e5cd38c1869701a4e839f8436b2 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <manauw@skynet.be>
Date: Wed, 5 Mar 2008 05:38:06 +0000
Subject: configure.ac: Clean up detection of different mjpegtoolsAPI versions.

Original commit message from CVS:
Patch by: Mark Nauwelaerts <manauw at skynet dot be>
* configure.ac:
Clean up detection of different mjpegtoolsAPI versions.
* ext/mpeg2enc/gstmpeg2enc.cc:
* ext/mpeg2enc/gstmpeg2enc.hh:
* ext/mpeg2enc/gstmpeg2encoder.cc:
* ext/mpeg2enc/gstmpeg2encoptions.cc:
* ext/mpeg2enc/gstmpeg2encpicturereader.cc:
* ext/mpeg2enc/gstmpeg2encpicturereader.hh:
* ext/mpeg2enc/gstmpeg2encstreamwriter.cc:
* ext/mpeg2enc/gstmpeg2encstreamwriter.hh:
Streamline conditional code for evolving mjpegtools API,
optimize and fix/prevent crash in log handling, use
names/nicks for enums in the usual way andm inor updates
in code and properties/settings. Partially fixes bug #520329.
---
 ext/mpeg2enc/gstmpeg2encstreamwriter.hh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ext/mpeg2enc/gstmpeg2encstreamwriter.hh')

diff --git a/ext/mpeg2enc/gstmpeg2encstreamwriter.hh b/ext/mpeg2enc/gstmpeg2encstreamwriter.hh
index 766d7bd1..eaa9cbac 100644
--- a/ext/mpeg2enc/gstmpeg2encstreamwriter.hh
+++ b/ext/mpeg2enc/gstmpeg2encstreamwriter.hh
@@ -27,7 +27,7 @@
 
 #include <elemstrmwriter.hh>
 
-#ifdef GST_MJPEGTOOLS_18x
+#if GST_MJPEGTOOLS_API >= 10800
 
 class GstMpeg2EncStreamWriter : public ElemStrmWriter {
   public:
@@ -61,6 +61,6 @@ private:
   GstPad *pad;
   GstBuffer *buf;
 };
-#endif /* GST_MJPEGTOOLS_18x */
+#endif /* GST_MJPEGTOOLS_API >= 10800 */
 
 #endif /* __GST_MPEG2ENCSTREAMWRITER_H__ */
-- 
cgit v1.2.1