if( tk->p_es )
{
- bool b, b_error;
- es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b, &b_error );
+ bool b;
+ es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
if( !b && tk->b_selected )
{
tk->b_selected = false;
asf_track_t *tk = p_sys->track[i];
if ( tk && tk->p_sp && tk->i_cat == VIDEO_ES )
{
- bool b_selected = false, b_error;
+ bool b_selected = false;
es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE,
- tk->p_es, &b_selected, &b_error );
+ tk->p_es, &b_selected );
if ( b_selected )
{
p_sys->i_seek_track = tk->p_sp->i_stream_number;
/* cannot be more than 100 stream (dcXX or wbXX) */
avi_track_toread_t toread[100];
+
/* detect new selected/unselected streams */
for( i_track = 0; i_track < p_sys->i_track; i_track++ )
{
avi_track_t *tk = p_sys->track[i_track];
- bool b, b_error;
+ bool b;
- es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b, &b_error );
+ es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
if( tk->p_es_dv_audio )
{
bool b_extra;
- es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es_dv_audio, &b_extra, &b_error );
+ es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es_dv_audio, &b_extra );
b |= b_extra;
}
if( b && !tk->b_activated )
for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ )
{
avi_track_t *tk = p_sys->track[i_stream];
- bool b, b_error;
+ bool b;
- es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b, &b_error );
+ es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
if( tk->p_es_dv_audio )
{
bool b_extra;
- es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es_dv_audio, &b_extra, b_error );
+ es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es_dv_audio, &b_extra );
b |= b_extra;
}
{
if( tracks[i_track]->i_seek_preroll )
{
- bool b_enabled, b_error;
+ bool b_enabled;
if( es_out_Control( sys.demuxer.out,
ES_OUT_GET_ES_STATE,
tracks[i_track]->p_es,
- &b_enabled, &b_error ) == VLC_SUCCESS &&
+ &b_enabled ) == VLC_SUCCESS &&
b_enabled )
i_seek_preroll = __MAX( i_seek_preroll,
tracks[i_track]->i_seek_preroll );
if ( tk->fmt.i_cat != NAV_ES )
{
- bool b, b_error;
- es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b, &b_error );
+ bool b;
+ es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
if( !b )
{
i_track++ )
{
mp4_track_t *tk = &p_sys->track[i_track];
- bool b, b_error;
+ bool b;
if( !tk->b_ok || tk->b_chapter ||
( tk->b_selected && tk->i_sample >= tk->i_sample_count ) )
continue;
}
- es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b, &b_error );
+ es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
if( tk->b_selected && !b )
{
static int TrackGotoChunkSample( demux_t *p_demux, mp4_track_t *p_track,
unsigned int i_chunk, unsigned int i_sample )
{
- bool b_reselect = false, b_error = false;
+ bool b_reselect = false;
/* now see if actual es is ok */
if( p_track->i_chunk >= p_track->i_chunk_count ||
p_track->i_track_ID );
es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE,
- p_track->p_es, &b_reselect, &b_error );
+ p_track->p_es, &b_reselect );
es_out_Del( p_demux->out, p_track->p_es );
for( i_track = 0, i_track_selected = 0; i_track < p_sys->i_tracks; i_track++ )
{
mp4_track_t *tk = &p_sys->track[i_track];
- bool b, b_error;
+ bool b;
if( !tk->b_ok || tk->b_chapter )
continue;
- es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b, &b_error );
+ es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
msg_Dbg( p_demux, "track %u %s!", tk->i_track_ID, b ? "enabled" : "disabled" );
if( tk->b_selected && !b )
logical_stream_t *p_candidate = p_sys->pp_stream[i];
if ( !p_candidate->p_es ) continue;
- bool b_selected = false, b_error;
+ bool b_selected = false;
es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE,
- p_candidate->p_es, &b_selected, &b_error );
+ p_candidate->p_es, &b_selected );
if ( !b_selected ) continue;
if ( !p_stream && p_candidate->fmt.i_cat == AUDIO_ES )
ogg_packet *p_oggpacket )
{
block_t *p_block;
- bool b_selected, b_error;
+ bool b_selected;
int i_header_len = 0;
mtime_t i_pts = VLC_TS_UNKNOWN;
demux_sys_t *p_ogg = p_demux->p_sys;
b_selected = true;
else
es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE,
- p_stream->p_es, &b_selected, &b_error );
+ p_stream->p_es, &b_selected );
if( p_stream->b_force_backup )
{
{
demux_sys_t *p_sys = p_demux->p_sys;
block_t *p_block;
- bool b_audio = false, b_error;
+ bool b_audio = false;
if( p_sys->b_hurry_up )
{
if( p_sys->p_es_audio )
{
es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE,
- p_sys->p_es_audio, &b_audio, &b_error );
+ p_sys->p_es_audio, &b_audio );
}
p_block->i_dts =
pi64 = (int64_t*)va_arg( args, int64_t * );
for( i = 0; i < p_sys->i_tracks; i++ )
{
- bool b_selected, b_error;
+ bool b_selected;
/* Check the ES is selected */
es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE,
- p_sys->track[i].p_es, &b_selected, &b_error );
+ p_sys->track[i].p_es, &b_selected );
if( b_selected ) break;
}
if( i < p_sys->i_tracks && p_sys->track[i].i_current_subtitle < p_sys->track[i].i_subtitles )
pf = (double*)va_arg( args, double * );
for( i = 0; i < p_sys->i_tracks; i++ )
{
- bool b_selected, b_error;
+ bool b_selected;
/* Check the ES is selected */
es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE,
- p_sys->track[i].p_es, &b_selected, &b_error );
+ p_sys->track[i].p_es, &b_selected );
if( b_selected ) break;
}
if( p_sys->track[i].i_current_subtitle >= p_sys->track[i].i_subtitles )