[MOVED FROM BAD 027/134] vp8: Only enable the encoder or decoder if it's available...

Fixes bug #619172.

diff --git a/ext/vp8/gstvp8dec.c b/ext/vp8/gstvp8dec.c
index f54bcb418b44ff098ac1f773c22ce2a73fa2c861..1e059c835617eca81f10f58c55c99cd97c8dc680 100644 (file)
--- a/ext/vp8/gstvp8dec.c
+++ b/ext/vp8/gstvp8dec.c
@@ -44,7 +44,7 @@
 
 #include "gstvp8utils.h"
 
-#if CONFIG_VP8_DECODER
+#ifdef HAVE_VP8_DECODER
 
 GST_DEBUG_CATEGORY_STATIC (gst_vp8dec_debug);
 #define GST_CAT_DEFAULT gst_vp8dec_debug
@@ -532,4 +532,4 @@ gst_vp8_dec_handle_frame (GstBaseVideoDecoder * decoder, GstVideoFrame * frame)
   return ret;
 }
 
-#endif /* CONFIG_VP8_DECODER */
+#endif /* HAVE_VP8_DECODER */

diff --git a/ext/vp8/gstvp8enc.c b/ext/vp8/gstvp8enc.c
index 04609789c1e7362562178378c1c4e7c78760afe0..0d6224badfc194fcb06d756d88174389c5bc78e1 100644 (file)
--- a/ext/vp8/gstvp8enc.c
+++ b/ext/vp8/gstvp8enc.c
@@ -45,7 +45,7 @@
 
 #include "gstvp8utils.h"
 
-#if CONFIG_VP8_ENCODER
+#ifdef HAVE_VP8_ENCODER
 
 GST_DEBUG_CATEGORY_STATIC (gst_vp8enc_debug);
 #define GST_CAT_DEFAULT gst_vp8enc_debug
@@ -844,4 +844,4 @@ gst_vp8_enc_sink_event (GstPad * pad, GstEvent * event)
   return ret;
 }
 
-#endif /* CONFIG_VP8_ENCODER */
+#endif /* HAVE_VP8_ENCODER */

diff --git a/ext/vp8/plugin.c b/ext/vp8/plugin.c
index 471c31093dc461403b945d937ff5ba2d02d10b95..4f4f194f95b811ee2e4ed4889f431970d5ef15d8 100644 (file)
--- a/ext/vp8/plugin.c
+++ b/ext/vp8/plugin.c
@@ -25,20 +25,18 @@
 
 #include <gst/gst.h>
 
-#include <vpx/vpx_config.h>
-
 GType gst_vp8_dec_get_type (void);
 GType gst_vp8_enc_get_type (void);
 
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-#if CONFIG_VP8_DECODER
+#ifdef HAVE_VP8_DECODER
   gst_element_register (plugin, "vp8dec", GST_RANK_PRIMARY,
       gst_vp8_dec_get_type ());
 #endif
 
-#if CONFIG_VP8_ENCODER
+#ifdef HAVE_VP8_DECODER
   gst_element_register (plugin, "vp8enc", GST_RANK_PRIMARY,
       gst_vp8_enc_get_type ());
 #endif