mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

vorbis: prefix get_copy_sample_func and fix duplicated symbols

Browse source
This commit is contained in:
Andoni Morales Alastruey 2013-05-03 14:16:33 +02:00
parent 595c49c40d
commit 35b3d805ed
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/vorbis/gstvorbisdec.c
View file

@ -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;
}

2
ext/vorbis/gstvorbisdeclib.c
View file

@ -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;

3
ext/vorbis/gstvorbisdeclib.h
View file

@ -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__ */