Changeset 4722


Ignore:
Timestamp:
Jan 29, 2014 10:40:40 AM (7 years ago)
Author:
nanang
Message:

Close #1729: Added check of PJMEDIA_HAS_VIDEO (instead of just specific backend check) in video device wrappers.

Location:
pjproject/trunk/pjmedia/src/pjmedia-videodev
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia-videodev/colorbar_dev.c

    r4158 r4722  
    2424 
    2525 
    26 #if defined(PJMEDIA_VIDEO_DEV_HAS_CBAR_SRC) && \ 
     26#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO != 0 && \ 
     27    defined(PJMEDIA_VIDEO_DEV_HAS_CBAR_SRC) && \ 
    2728    PJMEDIA_VIDEO_DEV_HAS_CBAR_SRC != 0 
     29     
    2830 
    2931 
  • pjproject/trunk/pjmedia/src/pjmedia-videodev/dshow_dev.c

    r4537 r4722  
    2424 
    2525 
    26 #if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 
     26#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO != 0 && \ 
     27    defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 
    2728 
    2829 
  • pjproject/trunk/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c

    r4537 r4722  
    3939 
    4040 
    41 #if defined(PJMEDIA_VIDEO_DEV_HAS_FFMPEG) && PJMEDIA_VIDEO_DEV_HAS_FFMPEG != 0 
     41#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO != 0 && \ 
     42    defined(PJMEDIA_VIDEO_DEV_HAS_FFMPEG) && PJMEDIA_VIDEO_DEV_HAS_FFMPEG != 0 
    4243 
    4344 
  • pjproject/trunk/pjmedia/src/pjmedia-videodev/ios_dev.m

    r4519 r4722  
    2222#include <pj/os.h> 
    2323 
    24 #if PJMEDIA_VIDEO_DEV_HAS_IOS && PJMEDIA_HAS_VIDEO 
     24#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO != 0 && \ 
     25    defined(PJMEDIA_VIDEO_DEV_HAS_IOS) && PJMEDIA_VIDEO_DEV_HAS_IOS != 0 
     26 
    2527#include "Availability.h" 
    2628#ifdef __IPHONE_4_0 
  • pjproject/trunk/pjmedia/src/pjmedia-videodev/qt_dev.m

    r3979 r4722  
    2222#include <pj/os.h> 
    2323 
    24 #if PJMEDIA_VIDEO_DEV_HAS_QT 
     24#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO != 0 && \ 
     25    defined(PJMEDIA_VIDEO_DEV_HAS_QT) && PJMEDIA_VIDEO_DEV_HAS_QT != 0 
    2526 
    2627#include <Foundation/NSAutoreleasePool.h> 
  • pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c

    r4535 r4722  
    2222#include <pj/os.h> 
    2323 
    24 #if defined(PJMEDIA_VIDEO_DEV_HAS_SDL) && PJMEDIA_VIDEO_DEV_HAS_SDL != 0 
     24#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO != 0 && \ 
     25    defined(PJMEDIA_VIDEO_DEV_HAS_SDL) && PJMEDIA_VIDEO_DEV_HAS_SDL != 0 
     26 
    2527#include <SDL.h> 
    2628#include <SDL_syswm.h> 
  • pjproject/trunk/pjmedia/src/pjmedia-videodev/v4l2_dev.c

    r4310 r4722  
    2626#include <pj/rand.h> 
    2727 
    28 #if PJMEDIA_VIDEO_DEV_HAS_V4L2 
     28#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO != 0 && \ 
     29    defined(PJMEDIA_VIDEO_DEV_HAS_V4L2) && PJMEDIA_VIDEO_DEV_HAS_V4L2 != 0 
    2930 
    3031#include <linux/videodev2.h> 
Note: See TracChangeset for help on using the changeset viewer.