Commit c8ab50b9 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove references to non-existent Altivec plugins

parent b331b629
...@@ -664,7 +664,7 @@ AC_CHECK_LIB(m,cos,[ ...@@ -664,7 +664,7 @@ AC_CHECK_LIB(m,cos,[
VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger],[-lm]) VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger],[-lm])
]) ])
AC_CHECK_LIB(m,pow,[ AC_CHECK_LIB(m,pow,[
VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realvideo qt4],[-lm]) VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realvideo qt4],[-lm])
]) ])
AC_CHECK_LIB(m,sqrt,[ AC_CHECK_LIB(m,sqrt,[
VLC_ADD_LIBS([compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball],[-lm]) VLC_ADD_LIBS([compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball],[-lm])
...@@ -1503,8 +1503,6 @@ AS_IF([test "${enable_altivec}" = "yes"], [ ...@@ -1503,8 +1503,6 @@ AS_IF([test "${enable_altivec}" = "yes"], [
AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, AC_DEFINE(CAN_COMPILE_ALTIVEC, 1,
[Define to 1 if AltiVec inline assembly is available.]) [Define to 1 if AltiVec inline assembly is available.])
AS_IF([test "${ac_cv_altivec_inline}" != "yes"], [ AS_IF([test "${ac_cv_altivec_inline}" != "yes"], [
VLC_ADD_CFLAGS([idctaltivec],[${ac_cv_altivec_inline}])
VLC_ADD_CFLAGS([motionaltivec],[${ac_cv_altivec_inline}])
VLC_ADD_CFLAGS([memcpyaltivec],[${ac_cv_altivec_inline}]) VLC_ADD_CFLAGS([memcpyaltivec],[${ac_cv_altivec_inline}])
VLC_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}]) VLC_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}])
VLC_ADD_CFLAGS([libvlccore],[${ac_cv_altivec_inline}]) VLC_ADD_CFLAGS([libvlccore],[${ac_cv_altivec_inline}])
...@@ -1569,7 +1567,6 @@ dnl - Others: test should fail ...@@ -1569,7 +1567,6 @@ dnl - Others: test should fail
AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1,
[Define to 1 if C AltiVec extensions are available.]) [Define to 1 if C AltiVec extensions are available.])
VLC_ADD_CFLAGS([libvlccore],[${ac_cv_c_altivec}]) VLC_ADD_CFLAGS([libvlccore],[${ac_cv_c_altivec}])
VLC_ADD_CFLAGS([idctaltivec motionaltivec],[${ac_cv_c_altivec}])
VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}]) VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}])
have_altivec="yes" have_altivec="yes"
]) ])
...@@ -1581,7 +1578,7 @@ dnl - Others: test should fail ...@@ -1581,7 +1578,7 @@ dnl - Others: test should fail
LDFLAGS="${LDFLAGS_save}" LDFLAGS="${LDFLAGS_save}"
]) ])
AS_IF([test "${ac_cv_ld_altivec}" != "no"], [ AS_IF([test "${ac_cv_ld_altivec}" != "no"], [
VLC_ADD_LDFLAGS([libvlccore idctaltivec motionaltivec memcpyaltivec],[-Wl,-framework,vecLib]) VLC_ADD_LDFLAGS([libvlccore memcpyaltivec],[-Wl,-framework,vecLib])
]) ])
]) ])
AM_CONDITIONAL([HAVE_ALTIVEC], [test "$have_altivec" = "yes"]) AM_CONDITIONAL([HAVE_ALTIVEC], [test "$have_altivec" = "yes"])
......
...@@ -39,19 +39,3 @@ libvlc_LTLIBRARIES += \ ...@@ -39,19 +39,3 @@ libvlc_LTLIBRARIES += \
EXTRA_LTLIBRARIES += \ EXTRA_LTLIBRARIES += \
libavcodec_plugin.la libavcodec_plugin.la
# FIXME SOURCES_ffmpegaltivec = \
# FIXME ffmpeg.c \
# FIXME ffmpeg.h \
# FIXME video.c \
# FIXME audio.c \
# FIXME video_filter.c \
# FIXME deinterlace.c \
# FIXME chroma.c \
# FIXME encoder.c \
# FIXME postprocess.c \
# FIXME demux.c \
# FIXME mux.c \
# FIXME scale.c \
# FIXME $(NULL)
...@@ -94,16 +94,9 @@ vlc_module_begin () ...@@ -94,16 +94,9 @@ vlc_module_begin ()
set_category( CAT_INPUT ) set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_VCODEC ) set_subcategory( SUBCAT_INPUT_VCODEC )
/* decoder main module */ /* decoder main module */
#if defined(MODULE_NAME_is_ffmpegaltivec) \
|| (defined(CAN_COMPILE_ALTIVEC) && !defined(NO_ALTIVEC_IN_FFMPEG))
set_description( N_("AltiVec FFmpeg audio/video decoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") )
/*add_requirement( ALTIVEC )*/
set_capability( "decoder", 71 )
#else
set_description( N_("FFmpeg audio/video decoder") ) set_description( N_("FFmpeg audio/video decoder") )
set_help( MODULE_DESCRIPTION ) set_help( MODULE_DESCRIPTION )
set_capability( "decoder", 70 ) set_capability( "decoder", 70 )
#endif
set_section( N_("Decoding") , NULL ) set_section( N_("Decoding") , NULL )
set_callbacks( OpenDecoder, CloseDecoder ) set_callbacks( OpenDecoder, CloseDecoder )
......
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