/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <errno.h>
/* Clean all subs from all tracks */
for( i = 0; i < p_sys->i_tracks; i++ )
- {
- if( p_sys->track[i].p_subtitles ) free( p_sys->track[i].p_subtitles );
- }
- if( p_sys->track ) free( p_sys->track );
+ free( p_sys->track[i].p_subtitles );
+
+ free( p_sys->track );
if( p_sys->p_vobsub_stream )
stream_Delete( p_sys->p_vobsub_stream );
if( txt->i_line_count <= 0 )
{
- if( txt->line ) free( txt->line );
+ free( txt->line );
return VLC_EGENERIC;
}
int i;
for( i = 0; i < txt->i_line_count; i++ )
- {
- if( txt->line[i] ) free( txt->line[i] );
- }
- if( txt->line ) free( txt->line );
+ free( txt->line[i] );
+
+ free( txt->line );
txt->i_line = 0;
txt->i_line_count = 0;
}
ms ) * 1000;
current_tk->i_delay = current_tk->i_delay + (i_gap * i_sign);
- msg_Dbg( p_demux, "sign: %+d gap: %+lld global delay: %+lld", i_sign, i_gap, current_tk->i_delay );
+ msg_Dbg( p_demux, "sign: %+d gap: %+lld global delay: %+lld",
+ i_sign, (long long)i_gap,
+ (long long)current_tk->i_delay );
}
}
}