vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Tue Aug 29 09:35:46 2017 +0200| [faf20c796e6c5c2fad075a207aa6e6943462a1d4] | committer: Hugo Beauzée-Luyssen
es_out: Don't attempt to read from NULL meta > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=faf20c796e6c5c2fad075a207aa6e6943462a1d4 --- src/input/es_out.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/input/es_out.c b/src/input/es_out.c index 1e191d83a1..e954843943 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -1484,7 +1484,7 @@ static void EsOutMeta( es_out_t *p_out, const vlc_meta_t *p_meta, const vlc_meta vlc_mutex_unlock( &p_item->lock ); /* Check program meta to not override GROUP_META values */ - if( (!p_program_meta || vlc_meta_Get( p_program_meta, vlc_meta_Title ) == NULL) && + if( p_meta && (!p_program_meta || vlc_meta_Get( p_program_meta, vlc_meta_Title ) == NULL) && vlc_meta_Get( p_meta, vlc_meta_Title ) != NULL ) input_item_SetName( p_item, vlc_meta_Get( p_meta, vlc_meta_Title ) ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
