For consistency, remove references to vlc from libvlc

[vlc] / modules / video_filter / swscale / filter.c

diff --git a/modules/video_filter/swscale/filter.c b/modules/video_filter/swscale/filter.c
index 8182aff874f1a2bcb80e6fcb4f506d3612eba447..5b50217340541ec2d2c9f07cbe443763fa28a59c 100644 (file)
--- a/modules/video_filter/swscale/filter.c
+++ b/modules/video_filter/swscale/filter.c
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -61,7 +61,7 @@ static int GetSwscaleChroma( vlc_fourcc_t );
  * Module descriptor
  *****************************************************************************/
 #define MODE_TEXT N_("Scaling mode")
-#define MODE_LONGTEXT N_("You can choose the default scaling mode.")
+#define MODE_LONGTEXT N_("Scaling mode to use.")
 
 static int pi_mode_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
 static char *ppsz_mode_descriptions[] =
@@ -119,23 +119,23 @@ static int OpenFilter( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    swscale_fast_memcpy = p_filter->p_vlc->pf_memcpy;
+    swscale_fast_memcpy = p_filter->p_libvlc->pf_memcpy;
 
     /* Set CPU capabilities */
     p_sys->i_cpu_mask = 0;
-    if( p_filter->p_libvlc->i_cpu & CPU_CAPABILITY_MMX )
+    if( p_filter->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMX )
     {
         p_sys->i_cpu_mask |= SWS_CPU_CAPS_MMX;
     }
-    if( p_filter->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT )
+    if( p_filter->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT )
     {
         p_sys->i_cpu_mask |= SWS_CPU_CAPS_MMX2;
     }
-    if( p_filter->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW )
+    if( p_filter->p_libvlc_global->i_cpu & CPU_CAPABILITY_3DNOW )
     {
         p_sys->i_cpu_mask |= SWS_CPU_CAPS_3DNOW;
     }
-    if( p_filter->p_libvlc->i_cpu & CPU_CAPABILITY_ALTIVEC )
+    if( p_filter->p_libvlc_global->i_cpu & CPU_CAPABILITY_ALTIVEC )
     {
         p_sys->i_cpu_mask |= SWS_CPU_CAPS_ALTIVEC;
     }