Changes on live555 make MacOS-X patch fail in extras/contrib.

[vlc] / include / vlc_es.h

diff --git a/include/vlc_es.h b/include/vlc_es.h
index 675dcb3f7a759ac24edbf40f8f8d901540c93d67..f9d36bd1c5ef3993bea1be03ecfea2b35e713a13 100644 (file)
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -201,7 +201,7 @@ static inline void es_format_Init( es_format_t *fmt,
     fmt->psz_description        = NULL;
 
     fmt->i_extra_languages      = 0;
-    fmt->p_extra_languages      = NULL;    
+    fmt->p_extra_languages      = NULL;
 
     memset( &fmt->audio, 0, sizeof(audio_format_t) );
     memset( &fmt->video, 0, sizeof(video_format_t) );
@@ -245,7 +245,9 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src )
     }
 
     dst->i_extra_languages = src->i_extra_languages;
-    dst->p_extra_languages = (extra_languages_t*) malloc( dst->i_extra_languages * sizeof(*dst->p_extra_languages ) );
+    if( dst->i_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++ ) {
         if( src->p_extra_languages[i].psz_language )
             dst->p_extra_languages[i].psz_language = strdup(src->p_extra_languages[i].psz_language);
@@ -270,7 +272,8 @@ static inline void es_format_Clean( es_format_t *fmt )
     fmt->i_extra = 0;
     fmt->p_extra = NULL;
 
-    if( fmt->video.p_palette ) free( fmt->video.p_palette );
+    if( fmt->video.p_palette )
+        free( fmt->video.p_palette );
     fmt->video.p_palette = NULL;
 
     if( fmt->subs.psz_encoding ) free( fmt->subs.psz_encoding );