Tie 770 SW scaler to OMAP FB, not to Hildon UI

Note that this won't work on OMAP1 (ARMv<6). However a trivial change
could enable that (the JIT supports ARMv5 too).

diff --git a/configure.ac b/configure.ac
index 7aea04b13e111795c07331a2c6a7450cf438291a..b7dcfd7d836b9aa1d664355ada51781947e23c24 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -733,7 +733,7 @@ AC_CHECK_LIB(m,sqrt,[
   VLC_ADD_LIBS([headphone_channel_mixer normvol speex mono colorthres extract],[-lm])
 ])
 AC_CHECK_LIB(m,ceil,[
-  VLC_ADD_LIBS([hotkeys mosaic swscale_maemo],[-lm])
+  VLC_ADD_LIBS([hotkeys mosaic swscale_omap],[-lm])
 ])
 AC_CHECK_LIB(m,exp,[
   VLC_ADD_LIBS([gaussianblur],[-lm])
@@ -3959,6 +3959,7 @@ AC_ARG_ENABLE(omapfb,
         AC_CHECK_HEADERS(X11/Xlib.h, [
           VLC_ADD_LIBS([omapfb],[${X_LIBS} ${X_PRE_LIBS} -lX11]) ])
       ])
+      VLC_ADD_PLUGIN([swscale_omap])
     fi
 
 dnl
@@ -4323,7 +4324,6 @@ then
     VLC_ADD_CFLAGS([maemo],[${HILDON_CFLAGS}])
     VLC_ADD_LIBS([maemo],[${HILDON_LIBS}])
     VLC_ADD_PLUGIN([maemo])
-    VLC_ADD_PLUGIN([swscale_maemo])
     ALIASES="${ALIASES} mvlc"
   ], [
     AS_IF([test "${enable_maemo}" = "yes"],[

diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index 5af788a7873b6c7285dc0f8c64281e7b48ded96b..7032375b5064902f6a2950d8488bba0a35c5f68f 100644 (file)
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -43,7 +43,7 @@ SOURCES_blendbench = blendbench.c
 SOURCES_chain = chain.c
 SOURCES_postproc = postproc.c
 SOURCES_swscale = swscale.c ../codec/avcodec/chroma.c
-SOURCES_swscale_maemo = swscale_maemo.c \
+SOURCES_swscale_omap = swscale_omap.c \
        libswscale_nokia770/arm_jit_swscale.c \
        libswscale_nokia770/arm_colorconv.S \
        libswscale_nokia770/arm_jit_swscale.h \

diff --git a/modules/video_filter/swscale_arm.c b/modules/video_filter/swscale_omap.c
similarity index 98%
rename from modules/video_filter/swscale_arm.c
rename to modules/video_filter/swscale_omap.c
index 6356ca2485507c8181f9568a24a871996ee0366f..24fb386575b14c825ecefbb05984c418cbdaa7bc 100644 (file)
--- a/modules/video_filter/swscale_arm.c
+++ b/modules/video_filter/swscale_omap.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * swscale_maemo.c: scaling and chroma conversion using libswscale_nokia770
+ * swscale_omap.c: scaling and chroma conversion using libswscale_nokia770
  *****************************************************************************
  * Copyright (C) 1999-2008 the VideoLAN team
  * $Id$

diff --git a/po/POTFILES.in b/po/POTFILES.in
index cef44321d1778ce29ad8ee30c0ed281f1a2cbf46..750df2de641734d5b1efefd474e35b6d5f87c618 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1225,7 +1225,7 @@ modules/video_filter/scale.c
 modules/video_filter/scene.c
 modules/video_filter/sharpen.c
 modules/video_filter/swscale.c
-modules/video_filter/swscale_maemo.c
+modules/video_filter/swscale_omap.c
 modules/video_filter/transform.c
 modules/video_filter/wall.c
 modules/video_filter/wave.c