Commit 22bfd4d8 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

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).
parent 8f6d32b1
......@@ -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"],[
......
......@@ -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 \
......
/*****************************************************************************
* 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$
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment