Commit 68372267 authored by Simon Morlat's avatar Simon Morlat

revert the loading of v4l2 backend on android, this seems to have very bad...

revert the loading of v4l2 backend on android, this seems to have very bad side effects with some phone models.
parent a7844071
......@@ -162,7 +162,8 @@ LOCAL_SRC_FILES += \
android/androidvideo.cpp \
android/android-opengl-display.c
LOCAL_CFLAGS += -DHAVE_LINUX_VIDEODEV2_H=1
#uncomment this if you want to try loading v4l2 cameras on android (not really supported by google).
#LOCAL_CFLAGS += -DHAVE_LINUX_VIDEODEV2_H=1
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_CFLAGS += -DVIDEO_ENABLED
......
......@@ -235,15 +235,14 @@ static MSWebCamDesc * ms_web_cam_descs[]={
#if TARGET_OS_MAC && !TARGET_OS_IPHONE
&ms_v4m_cam_desc,
#endif
#ifdef __QNX__
&ms_bb10_camera_desc,
#endif
#if TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
&ms_v4ios_cam_desc,
#endif
&ms_mire_webcam_desc,
&static_image_desc,
#ifdef __QNX__
&ms_bb10_camera_desc,
#endif
#endif /*MS2_FILTERS */
NULL
};
......
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