mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 04:01:08 +00:00
[MOVED FROM BAD 027/134] vp8: Only enable the encoder or decoder if it's available in libvpx
Fixes bug #619172.
This commit is contained in:
parent
2c0d247ad9
commit
9cb55fb96b
3 changed files with 6 additions and 8 deletions
|
@ -44,7 +44,7 @@
|
||||||
|
|
||||||
#include "gstvp8utils.h"
|
#include "gstvp8utils.h"
|
||||||
|
|
||||||
#if CONFIG_VP8_DECODER
|
#ifdef HAVE_VP8_DECODER
|
||||||
|
|
||||||
GST_DEBUG_CATEGORY_STATIC (gst_vp8dec_debug);
|
GST_DEBUG_CATEGORY_STATIC (gst_vp8dec_debug);
|
||||||
#define GST_CAT_DEFAULT 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;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_VP8_DECODER */
|
#endif /* HAVE_VP8_DECODER */
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
|
|
||||||
#include "gstvp8utils.h"
|
#include "gstvp8utils.h"
|
||||||
|
|
||||||
#if CONFIG_VP8_ENCODER
|
#ifdef HAVE_VP8_ENCODER
|
||||||
|
|
||||||
GST_DEBUG_CATEGORY_STATIC (gst_vp8enc_debug);
|
GST_DEBUG_CATEGORY_STATIC (gst_vp8enc_debug);
|
||||||
#define GST_CAT_DEFAULT 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;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_VP8_ENCODER */
|
#endif /* HAVE_VP8_ENCODER */
|
||||||
|
|
|
@ -25,20 +25,18 @@
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
|
|
||||||
#include <vpx/vpx_config.h>
|
|
||||||
|
|
||||||
GType gst_vp8_dec_get_type (void);
|
GType gst_vp8_dec_get_type (void);
|
||||||
GType gst_vp8_enc_get_type (void);
|
GType gst_vp8_enc_get_type (void);
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
plugin_init (GstPlugin * plugin)
|
plugin_init (GstPlugin * plugin)
|
||||||
{
|
{
|
||||||
#if CONFIG_VP8_DECODER
|
#ifdef HAVE_VP8_DECODER
|
||||||
gst_element_register (plugin, "vp8dec", GST_RANK_PRIMARY,
|
gst_element_register (plugin, "vp8dec", GST_RANK_PRIMARY,
|
||||||
gst_vp8_dec_get_type ());
|
gst_vp8_dec_get_type ());
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if CONFIG_VP8_ENCODER
|
#ifdef HAVE_VP8_DECODER
|
||||||
gst_element_register (plugin, "vp8enc", GST_RANK_PRIMARY,
|
gst_element_register (plugin, "vp8enc", GST_RANK_PRIMARY,
|
||||||
gst_vp8_enc_get_type ());
|
gst_vp8_enc_get_type ());
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue