Fixed #1271: protected all video features with PJMEDIA_HAS_VIDEO macro setting.
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@3667 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjmedia/src/pjmedia-videodev/colorbar_dev.c b/pjmedia/src/pjmedia-videodev/colorbar_dev.c
index 7d6c348..ef343e0 100644
--- a/pjmedia/src/pjmedia-videodev/colorbar_dev.c
+++ b/pjmedia/src/pjmedia-videodev/colorbar_dev.c
@@ -22,7 +22,10 @@
#include <pj/os.h>
#include <pj/rand.h>
-#if PJMEDIA_VIDEO_DEV_HAS_CBAR_SRC
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_CBAR_SRC) && \
+ PJMEDIA_VIDEO_DEV_HAS_CBAR_SRC != 0
+
#define THIS_FILE "colorbar_dev.c"
#define DEFAULT_CLOCK_RATE 90000
diff --git a/pjmedia/src/pjmedia-videodev/dshow_dev.c b/pjmedia/src/pjmedia-videodev/dshow_dev.c
index c69393f..cfc7a7e 100644
--- a/pjmedia/src/pjmedia-videodev/dshow_dev.c
+++ b/pjmedia/src/pjmedia-videodev/dshow_dev.c
@@ -22,7 +22,9 @@
#include <pj/os.h>
#include <pj/unicode.h>
-#if PJMEDIA_VIDEO_DEV_HAS_DSHOW
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0
+
#ifdef _MSC_VER
# pragma warning(push, 3)
diff --git a/pjmedia/src/pjmedia-videodev/dshowclasses.cpp b/pjmedia/src/pjmedia-videodev/dshowclasses.cpp
index bdddd01..333d142 100644
--- a/pjmedia/src/pjmedia-videodev/dshowclasses.cpp
+++ b/pjmedia/src/pjmedia-videodev/dshowclasses.cpp
@@ -19,7 +19,9 @@
#include <pjmedia-videodev/config.h>
-#if PJMEDIA_VIDEO_DEV_HAS_DSHOW
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0
+
#include <assert.h>
#include <streams.h>
@@ -242,4 +244,5 @@
((OutputPin *)src->GetPin(0))->bufSize = pmt->lSampleSize;
}
+
#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */
diff --git a/pjmedia/src/pjmedia-videodev/errno.c b/pjmedia/src/pjmedia-videodev/errno.c
index c0729ca..6a553ec 100644
--- a/pjmedia/src/pjmedia-videodev/errno.c
+++ b/pjmedia/src/pjmedia-videodev/errno.c
@@ -25,6 +25,10 @@
* Message must be limited to 64 chars!
*/
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
+
#if defined(PJ_HAS_ERROR_STRING) && (PJ_HAS_ERROR_STRING != 0)
static const struct
@@ -110,3 +114,6 @@
return errstr;
}
+
+
+#endif /* PJMEDIA_HAS_VIDEO */
diff --git a/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c b/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c
index aa02c87..3c0de4a 100644
--- a/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c
+++ b/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c
@@ -37,7 +37,9 @@
#include <pj/os.h>
#include <pj/unicode.h>
-#if PJMEDIA_VIDEO_DEV_HAS_FFMPEG
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_FFMPEG) && PJMEDIA_VIDEO_DEV_HAS_FFMPEG != 0
+
#define THIS_FILE "ffmpeg.c"
@@ -511,4 +513,5 @@
# pragma comment( lib, "avutil.lib")
#endif
+
#endif /* PJMEDIA_VIDEO_DEV_HAS_FFMPEG */
diff --git a/pjmedia/src/pjmedia-videodev/sdl_dev.c b/pjmedia/src/pjmedia-videodev/sdl_dev.c
index 115b362..3e437ad 100644
--- a/pjmedia/src/pjmedia-videodev/sdl_dev.c
+++ b/pjmedia/src/pjmedia-videodev/sdl_dev.c
@@ -22,7 +22,9 @@
#include <pj/log.h>
#include <pj/os.h>
-#if PJMEDIA_VIDEO_DEV_HAS_SDL
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_SDL) && PJMEDIA_VIDEO_DEV_HAS_SDL != 0
+
#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
# include <Foundation/Foundation.h>
@@ -1288,4 +1290,5 @@
# endif
#endif
+
#endif /* PJMEDIA_VIDEO_DEV_HAS_SDL */
diff --git a/pjmedia/src/pjmedia-videodev/videodev.c b/pjmedia/src/pjmedia-videodev/videodev.c
index 833608e..f626a55 100644
--- a/pjmedia/src/pjmedia-videodev/videodev.c
+++ b/pjmedia/src/pjmedia-videodev/videodev.c
@@ -23,6 +23,10 @@
#include <pj/pool.h>
#include <pj/string.h>
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
+
#define THIS_FILE "videodev.c"
#define DEFINE_CAP(name, info) {name, info}
@@ -804,3 +808,6 @@
{
return strm->op->destroy(strm);
}
+
+
+#endif /* PJMEDIA_HAS_VIDEO */