Skip to content

V
vlc-2-2
Commit 04b82589 authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files
Options

Fix compilation

parent daddd71a
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 6 deletions
include/vlc_es.h
View file @ 04b82589
...@@ -142,6 +142,13 @@ struct subs_format_t ...@@ -142,6 +142,13 @@ struct subs_format_t
/** /**
* ES definition * ES definition
*/ */
typedef struct extra_languages_t
{
char *psz_language;
char *psz_description;
} extra_languages_t;
struct es_format_t struct es_format_t
{ {
int i_cat; int i_cat;
...@@ -160,11 +167,8 @@ struct es_format_t ...@@ -160,11 +167,8 @@ struct es_format_t
char *psz_language; char *psz_language;
char *psz_description; char *psz_description;
int i_extra_languages; int i_extra_languages;
struct { extra_languages_t *p_extra_languages;
char *psz_language;
char *psz_description;
} *p_extra_languages;
audio_format_t audio; audio_format_t audio;
video_format_t video; video_format_t video;
subs_format_t subs; subs_format_t subs;
...@@ -241,7 +245,7 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src ) ...@@ -241,7 +245,7 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src )
} }
dst->i_extra_languages = src->i_extra_languages; dst->i_extra_languages = src->i_extra_languages;
dst->p_extra_languages = malloc( dst->i_extra_languages * sizeof(*dst->p_extra_languages ) ); dst->p_extra_languages = (extra_languages_t*) malloc( dst->i_extra_languages * sizeof(*dst->p_extra_languages ) );
for( i = 0; i < dst->i_extra_languages; i++ ) { for( i = 0; i < dst->i_extra_languages; i++ ) {
if( src->p_extra_languages[i].psz_language ) if( src->p_extra_languages[i].psz_language )
dst->p_extra_languages[i].psz_language = strdup(src->p_extra_languages[i].psz_language); dst->p_extra_languages[i].psz_language = strdup(src->p_extra_languages[i].psz_language);
......
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