From 35b3d805edfb7be4147eee9f1dac20deb1acfbf7 Mon Sep 17 00:00:00 2001 From: Andoni Morales Alastruey Date: Fri, 3 May 2013 14:16:33 +0200 Subject: [PATCH] vorbis: prefix get_copy_sample_func and fix duplicated symbols --- ext/vorbis/gstvorbisdec.c | 2 +- ext/vorbis/gstvorbisdeclib.c | 2 +- ext/vorbis/gstvorbisdeclib.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ext/vorbis/gstvorbisdec.c b/ext/vorbis/gstvorbisdec.c index 8b10d57..7273d2c 100644 --- a/ext/vorbis/gstvorbisdec.c +++ b/ext/vorbis/gstvorbisdec.c @@ -200,7 +200,7 @@ vorbis_handle_identification_packet (GstVorbisDec * vd) vd->info = info; /* select a copy_samples function, this way we can have specialized versions * for mono/stereo and avoid the depth switch in tremor case */ - vd->copy_samples = get_copy_sample_func (info.channels); + vd->copy_samples = gst_vorbis_get_copy_sample_func (info.channels); return GST_FLOW_OK; } diff --git a/ext/vorbis/gstvorbisdeclib.c b/ext/vorbis/gstvorbisdeclib.c index 1079586..e003584 100644 --- a/ext/vorbis/gstvorbisdeclib.c +++ b/ext/vorbis/gstvorbisdeclib.c @@ -82,7 +82,7 @@ copy_samples (vorbis_sample_t * out, vorbis_sample_t ** in, guint samples, } CopySampleFunc -get_copy_sample_func (gint channels) +gst_vorbis_get_copy_sample_func (gint channels) { CopySampleFunc f = NULL; diff --git a/ext/vorbis/gstvorbisdeclib.h b/ext/vorbis/gstvorbisdeclib.h index cbb4fdf..7f711a7 100644 --- a/ext/vorbis/gstvorbisdeclib.h +++ b/ext/vorbis/gstvorbisdeclib.h @@ -62,6 +62,7 @@ #define GstVorbisDec GstIVorbisDec #define GstVorbisDecClass GstIVorbisDecClass #define gst_vorbis_dec_get_type gst_ivorbis_dec_get_type +#define gst_vorbis_get_copy_sample_func gst_ivorbis_get_copy_sample_func #endif /* TREMOR */ @@ -187,6 +188,6 @@ gst_ogg_packet_from_wrapper (ogg_packet_wrapper * packet) typedef void (*CopySampleFunc)(vorbis_sample_t *out, vorbis_sample_t **in, guint samples, gint channels); -CopySampleFunc get_copy_sample_func (gint channels); +CopySampleFunc gst_vorbis_get_copy_sample_func (gint channels); #endif /* __GST_VORBIS_DEC_LIB_H__ */ -- 2.7.4