demux: de-inline demux_Demux()

This commit is contained in:
Rémi Denis-Courmont 2020-09-27 12:07:28 +03:00
parent f8ba4fc3bf
commit 96d67cec94
3 changed files with 9 additions and 8 deletions

View File

@ -298,14 +298,7 @@ static inline void demux_Delete(demux_t *demux)
VLC_API int demux_vaControlHelper( stream_t *, int64_t i_start, int64_t i_end,
int64_t i_bitrate, int i_align, int i_query, va_list args );
VLC_USED static inline int demux_Demux( demux_t *p_demux )
{
if( !p_demux->pf_demux )
return VLC_DEMUXER_SUCCESS;
return p_demux->pf_demux( p_demux );
}
VLC_API int demux_Demux( demux_t *p_demux ) VLC_USED;
VLC_API int demux_vaControl( demux_t *p_demux, int i_query, va_list args );
static inline int demux_Control( demux_t *p_demux, int i_query, ... )

View File

@ -198,6 +198,13 @@ error:
return NULL;
}
int demux_Demux(demux_t *demux)
{
if (demux->pf_demux != NULL)
return demux->pf_demux(demux);
return VLC_DEMUXER_SUCCESS;
}
#define static_control_match(foo) \
static_assert((unsigned) DEMUX_##foo == STREAM_##foo, "Mismatch")

View File

@ -92,6 +92,7 @@ vlc_decoder_device_Release
demux_PacketizerDestroy
demux_PacketizerNew
demux_New
demux_Demux
demux_vaControl
demux_vaControlHelper
vlc_demux_chained_New