Do not cache non existing memcpy module

diff --git a/src/libvlc.c b/src/libvlc.c
index 8aa63af9f73d28e59c36d5c1031c2c6330b804c6..cef48a531819a9fcb6deda2726279a463190893e 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -450,11 +450,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
         priv->b_color = var_InheritBool( p_libvlc, "color" );
 
     vlc_CPU_dump( VLC_OBJECT(p_libvlc) );
-    /*
-     * Choose the best memcpy module
-     */
-    priv->p_memcpy_module = module_need( p_libvlc, "memcpy", "$memcpy", false );
-    /* Avoid being called "memcpy":*/
     vlc_object_set_name( p_libvlc, "main" );
 
     priv->b_stats = var_InheritBool( p_libvlc, "stats" );
@@ -491,10 +486,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     if( !p_playlist )
     {
         msg_Err( p_libvlc, "playlist initialization failed" );
-        if( priv->p_memcpy_module != NULL )
-        {
-            module_unneed( p_libvlc, priv->p_memcpy_module );
-        }
         module_EndBank (true);
         return VLC_EGENERIC;
     }
@@ -716,12 +707,6 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
     }
 #endif
 
-    if( priv->p_memcpy_module )
-    {
-        module_unneed( p_libvlc, priv->p_memcpy_module );
-        priv->p_memcpy_module = NULL;
-    }
-
     /* Save the configuration */
     if( !var_InheritBool( p_libvlc, "ignore-config" ) )
         config_AutoSaveConfigFile( VLC_OBJECT(p_libvlc) );

diff --git a/src/libvlc.h b/src/libvlc.h
index 7ba6734a73413427fa326f786f192f01bcb1e95a..5d744507043671f9e72dadc995076d157c3bc037 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -176,7 +176,6 @@ typedef struct libvlc_priv_t
     bool               b_stats;     ///< Whether to collect stats
 
     /* Singleton objects */
-    module_t          *p_memcpy_module;  ///< Fast memcpy plugin used
     playlist_t        *p_playlist; ///< the playlist singleton
     struct media_library_t *p_ml;    ///< the ML singleton
     vlc_mutex_t       ml_lock; ///< Mutex for ML creation