Commit 93682d7c authored by Laurent Aimar's avatar Laurent Aimar

Allowed to have access_demux without pf_demux as slave.

It would be the proper thing to do to convert real time access_demux
to work without pf_demux callback (it includes oss,alsa,rtp,screen
at least).
parent 9d0c20c5
...@@ -2808,6 +2808,13 @@ static void SlaveDemux( input_thread_t *p_input, bool *pb_demux_polled ) ...@@ -2808,6 +2808,13 @@ static void SlaveDemux( input_thread_t *p_input, bool *pb_demux_polled )
if( in->b_eof ) if( in->b_eof )
continue; continue;
const bool b_demux_polled = in->p_demux->pf_demux != NULL;
if( !b_demux_polled )
continue;
*pb_demux_polled = true;
/* Call demux_Demux until we have read enough data */
if( demux_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) ) if( demux_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) )
{ {
for( ;; ) for( ;; )
...@@ -2835,7 +2842,6 @@ static void SlaveDemux( input_thread_t *p_input, bool *pb_demux_polled ) ...@@ -2835,7 +2842,6 @@ static void SlaveDemux( input_thread_t *p_input, bool *pb_demux_polled )
{ {
i_ret = demux_Demux( in->p_demux ); i_ret = demux_Demux( in->p_demux );
} }
*pb_demux_polled |= in->p_demux->pf_demux != NULL;
if( i_ret <= 0 ) if( i_ret <= 0 )
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment