Unexport aout_FifoPop() and aout_FifoPush()

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index d23d68e410b49c5ee423418143ab941b2a44cddc..a0791f8e5109befe0843be79652f712c6080e1de 100644 (file)
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -241,9 +241,6 @@ VLC_API void aout_FormatPrepare( audio_sample_format_t * p_format );
 VLC_API void aout_FormatPrint( audio_output_t * p_aout, const char * psz_text, const audio_sample_format_t * p_format );
 VLC_API const char * aout_FormatPrintChannels( const audio_sample_format_t * ) VLC_USED;
 
-VLC_API aout_buffer_t *aout_FifoPop( aout_fifo_t * p_fifo ) VLC_USED;
-VLC_API void aout_FifoPush( aout_fifo_t *, block_t * );
-
 VLC_API void aout_VolumeNoneInit( audio_output_t * );
 VLC_API void aout_VolumeSoftInit( audio_output_t * );
 VLC_API void aout_VolumeHardInit( audio_output_t *, aout_volume_cb );

diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index 1e3997fdc8fd5887356b8da629aa448324ca3fc4..ab2eb1efad1a746a830354a9a9c99290b725b0fb 100644 (file)
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -158,8 +158,10 @@ audio_output_t *aout_New ( vlc_object_t * );
 #define aout_New(a) aout_New(VLC_OBJECT(a))
 
 void aout_FifoInit( vlc_object_t *, aout_fifo_t *, uint32_t );
+mtime_t aout_FifoFirstDate( const aout_fifo_t * ) VLC_USED;
 #define aout_FifoInit(o, f, r) aout_FifoInit(VLC_OBJECT(o), f, r)
-//void aout_FifoPush( aout_fifo_t *, aout_buffer_t * );
+void aout_FifoPush( aout_fifo_t *, aout_buffer_t * );
+aout_buffer_t *aout_FifoPop( aout_fifo_t * p_fifo ) VLC_USED;
 void aout_FifoReset( aout_fifo_t * );
 void aout_FifoMoveDates( aout_fifo_t *, mtime_t );
 void aout_FifoDestroy( aout_fifo_t * p_fifo );

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 537cb369e7ac5e2b3609d9bf3e2ef668eb63c576..9e2066ded72d74469ec13d871f06a45e5c5e97bc 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -13,8 +13,6 @@ aout_ChannelsRestart
 aout_CheckChannelExtraction
 aout_CheckChannelReorder
 aout_EnableFilter
-aout_FifoPop
-aout_FifoPush
 aout_filter_RequestVout
 aout_FormatPrepare
 aout_FormatPrint