char *psz_language; /**< human readible language name */
char *psz_description; /**< human readible description of language */
- int i_extra_languages; /**< length in bytes of extra language data pointer */
+ unsigned i_extra_languages; /**< length in bytes of extra language data pointer */
extra_languages_t *p_extra_languages; /**< extra language data needed by some decoders */
audio_format_t audio; /**< description of audio format */
pid->es->fmt.i_extra_languages );
if( pid->es->fmt.p_extra_languages )
{
- for( int i = 0; i < pid->es->fmt.i_extra_languages; i++ )
+ for( unsigned i = 0; i < pid->es->fmt.i_extra_languages; i++ )
{
pid->es->fmt.p_extra_languages[i].psz_language = malloc(4);
if( pid->es->fmt.p_extra_languages[i].psz_language )
int es_format_Copy( es_format_t *dst, const es_format_t *src )
{
- int i;
memcpy( dst, src, sizeof( es_format_t ) );
dst->psz_language = src->psz_language ? strdup( src->psz_language ) : NULL;
dst->psz_description = src->psz_description ? strdup( src->psz_description ) : NULL;
malloc(dst->i_extra_languages * sizeof(*dst->p_extra_languages ));
if( dst->p_extra_languages )
{
- for( i = 0; i < dst->i_extra_languages; i++ ) {
+ for( unsigned i = 0; i < dst->i_extra_languages; i++ ) {
if( src->p_extra_languages[i].psz_language )
dst->p_extra_languages[i].psz_language = strdup( src->p_extra_languages[i].psz_language );
else
if ( fmt->subs.p_style ) text_style_Delete( fmt->subs.p_style );
- if( fmt->i_extra_languages > 0 && fmt->p_extra_languages )
+ for( unsigned i = 0; i < fmt->i_extra_languages; i++ )
{
- int i;
- for( i = 0; i < fmt->i_extra_languages; i++ )
- {
- free( fmt->p_extra_languages[i].psz_language );
- free( fmt->p_extra_languages[i].psz_description );
- }
- free( fmt->p_extra_languages );
+ free( fmt->p_extra_languages[i].psz_language );
+ free( fmt->p_extra_languages[i].psz_description );
}
+ free( fmt->p_extra_languages );
/* es_format_Clean can be called multiple times */
memset( fmt, 0, sizeof(*fmt) );