Fix ffmpeg linking

diff --git a/modules/codec/ffmpeg/demux.c b/modules/codec/ffmpeg/demux.c
index a0f169e346f2c8de7e4900447fa3a1c1cb75dc9a..8fd03644b5411acb01743ff01be9710d9f1bfb58 100644 (file)
--- a/modules/codec/ffmpeg/demux.c
+++ b/modules/codec/ffmpeg/demux.c
@@ -401,8 +401,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_META:
         {
-            vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** );
-            vlc_meta_t *meta;
+            vlc_meta_t *p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
 
             if( !p_sys->ic->title[0] || !p_sys->ic->author[0] ||
                 !p_sys->ic->copyright[0] || !p_sys->ic->comment[0] ||
@@ -411,18 +410,16 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                 return VLC_EGENERIC;
             }
 
-            *pp_meta = meta = vlc_meta_New();
-
             if( p_sys->ic->title[0] )
-                vlc_meta_Add( meta, VLC_META_TITLE, p_sys->ic->title );
+                vlc_meta_SetTitle( p_meta, p_sys->ic->title );
             if( p_sys->ic->author[0] )
-                vlc_meta_Add( meta, VLC_META_AUTHOR, p_sys->ic->author );
+                vlc_meta_SetAuthor( p_meta, p_sys->ic->author );
             if( p_sys->ic->copyright[0] )
-                vlc_meta_Add( meta, VLC_META_COPYRIGHT, p_sys->ic->copyright );
+                vlc_meta_SetCopyright( p_meta, p_sys->ic->copyright );
             if( p_sys->ic->comment[0] )
-                vlc_meta_Add( meta, VLC_META_DESCRIPTION, p_sys->ic->comment );
+                vlc_meta_SetDescription( p_meta, p_sys->ic->comment );
             if( p_sys->ic->genre[0] )
-                vlc_meta_Add( meta, VLC_META_GENRE, p_sys->ic->genre );
+                vlc_meta_SetGenre( p_meta, p_sys->ic->genre );
             return VLC_SUCCESS;
         }