[vlc-commits] Do not cache non existing memcpy module

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Aug 31 01:12:23 2012 +0200| [9c9b7a3df922bb9dc2bee9d2975486c335379ed5] | committer: Rafaël Carré

Do not cache non existing memcpy module

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9c9b7a3df922bb9dc2bee9d2975486c335379ed5
---

 src/libvlc.c |   15 ---------------
 src/libvlc.h |    1 -
 2 files changed, 16 deletions(-)

diff --git a/src/libvlc.c b/src/libvlc.c
index 8aa63af..cef48a5 100644
--- 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 7ba6734..5d74450 100644
--- 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