diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2014-01-29 10:40:40 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2014-01-29 10:40:40 +0000 |
commit | 29b2490f6c22ec98dfb743f34f0b5e56bcb76dc7 (patch) | |
tree | 5e1b25313727bf972efa5e6d6e62ea4fcf065b78 /pjmedia/src | |
parent | 17414be78d49c9a7651f11a4ab390b28672645ef (diff) |
Close #1729: Added check of PJMEDIA_HAS_VIDEO (instead of just specific backend check) in video device wrappers.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4722 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src')
-rw-r--r-- | pjmedia/src/pjmedia-videodev/colorbar_dev.c | 4 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-videodev/dshow_dev.c | 3 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-videodev/ffmpeg_dev.c | 3 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-videodev/ios_dev.m | 4 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-videodev/qt_dev.m | 3 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-videodev/sdl_dev.c | 4 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-videodev/v4l2_dev.c | 3 |
7 files changed, 17 insertions, 7 deletions
diff --git a/pjmedia/src/pjmedia-videodev/colorbar_dev.c b/pjmedia/src/pjmedia-videodev/colorbar_dev.c index 699c8d11..0b5e1449 100644 --- a/pjmedia/src/pjmedia-videodev/colorbar_dev.c +++ b/pjmedia/src/pjmedia-videodev/colorbar_dev.c @@ -23,8 +23,10 @@ #include <pj/rand.h> -#if defined(PJMEDIA_VIDEO_DEV_HAS_CBAR_SRC) && \ +#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO != 0 && \ + defined(PJMEDIA_VIDEO_DEV_HAS_CBAR_SRC) && \ PJMEDIA_VIDEO_DEV_HAS_CBAR_SRC != 0 + #define THIS_FILE "colorbar_dev.c" diff --git a/pjmedia/src/pjmedia-videodev/dshow_dev.c b/pjmedia/src/pjmedia-videodev/dshow_dev.c index e1d4ca97..7bf1a4c5 100644 --- a/pjmedia/src/pjmedia-videodev/dshow_dev.c +++ b/pjmedia/src/pjmedia-videodev/dshow_dev.c @@ -23,7 +23,8 @@ #include <pj/unicode.h> -#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 +#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO != 0 && \ + defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 #ifdef _MSC_VER diff --git a/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c b/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c index b70396ec..b379e971 100644 --- a/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c +++ b/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c @@ -38,7 +38,8 @@ #include <pj/unicode.h> -#if defined(PJMEDIA_VIDEO_DEV_HAS_FFMPEG) && PJMEDIA_VIDEO_DEV_HAS_FFMPEG != 0 +#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO != 0 && \ + defined(PJMEDIA_VIDEO_DEV_HAS_FFMPEG) && PJMEDIA_VIDEO_DEV_HAS_FFMPEG != 0 #define THIS_FILE "ffmpeg.c" diff --git a/pjmedia/src/pjmedia-videodev/ios_dev.m b/pjmedia/src/pjmedia-videodev/ios_dev.m index 87f825d4..307a445d 100644 --- a/pjmedia/src/pjmedia-videodev/ios_dev.m +++ b/pjmedia/src/pjmedia-videodev/ios_dev.m @@ -21,7 +21,9 @@ #include <pj/log.h> #include <pj/os.h> -#if PJMEDIA_VIDEO_DEV_HAS_IOS && PJMEDIA_HAS_VIDEO +#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO != 0 && \ + defined(PJMEDIA_VIDEO_DEV_HAS_IOS) && PJMEDIA_VIDEO_DEV_HAS_IOS != 0 + #include "Availability.h" #ifdef __IPHONE_4_0 diff --git a/pjmedia/src/pjmedia-videodev/qt_dev.m b/pjmedia/src/pjmedia-videodev/qt_dev.m index cef1f36e..e5d512d8 100644 --- a/pjmedia/src/pjmedia-videodev/qt_dev.m +++ b/pjmedia/src/pjmedia-videodev/qt_dev.m @@ -21,7 +21,8 @@ #include <pj/log.h> #include <pj/os.h> -#if PJMEDIA_VIDEO_DEV_HAS_QT +#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO != 0 && \ + defined(PJMEDIA_VIDEO_DEV_HAS_QT) && PJMEDIA_VIDEO_DEV_HAS_QT != 0 #include <Foundation/NSAutoreleasePool.h> #include <QTKit/QTKit.h> diff --git a/pjmedia/src/pjmedia-videodev/sdl_dev.c b/pjmedia/src/pjmedia-videodev/sdl_dev.c index 0804d7a1..fbafb812 100644 --- a/pjmedia/src/pjmedia-videodev/sdl_dev.c +++ b/pjmedia/src/pjmedia-videodev/sdl_dev.c @@ -21,7 +21,9 @@ #include <pj/log.h> #include <pj/os.h> -#if defined(PJMEDIA_VIDEO_DEV_HAS_SDL) && PJMEDIA_VIDEO_DEV_HAS_SDL != 0 +#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO != 0 && \ + defined(PJMEDIA_VIDEO_DEV_HAS_SDL) && PJMEDIA_VIDEO_DEV_HAS_SDL != 0 + #include <SDL.h> #include <SDL_syswm.h> #if PJMEDIA_VIDEO_DEV_SDL_HAS_OPENGL diff --git a/pjmedia/src/pjmedia-videodev/v4l2_dev.c b/pjmedia/src/pjmedia-videodev/v4l2_dev.c index 2fa6334f..014d6596 100644 --- a/pjmedia/src/pjmedia-videodev/v4l2_dev.c +++ b/pjmedia/src/pjmedia-videodev/v4l2_dev.c @@ -25,7 +25,8 @@ #include <pj/os.h> #include <pj/rand.h> -#if PJMEDIA_VIDEO_DEV_HAS_V4L2 +#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO != 0 && \ + defined(PJMEDIA_VIDEO_DEV_HAS_V4L2) && PJMEDIA_VIDEO_DEV_HAS_V4L2 != 0 #include <linux/videodev2.h> #include <libv4l2.h> |