diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2016-06-16 10:38:34 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2016-06-16 10:38:34 +0000 |
| commit | d0644169cbb76202d28ba42c6a357d03cb5ad7c8 (patch) | |
| tree | b5c4612cb53587044c8020c09e0ba320d8b23572 /pjmedia/src/pjmedia-videodev/videodev.c | |
| parent | 3fd9e3846649c9cd033f1a791fe7c5f9aab33944 (diff) | |
Re #1931: Add support for AVFoundation on Mac
- Deprecate QTKit
- Rename ios_dev.m to darwin_dev.m
- Important: Re-run configure and make dep after applying this change!
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5347 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/pjmedia-videodev/videodev.c')
| -rw-r--r-- | pjmedia/src/pjmedia-videodev/videodev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pjmedia/src/pjmedia-videodev/videodev.c b/pjmedia/src/pjmedia-videodev/videodev.c index 1d560975..847999d3 100644 --- a/pjmedia/src/pjmedia-videodev/videodev.c +++ b/pjmedia/src/pjmedia-videodev/videodev.c @@ -55,8 +55,8 @@ pjmedia_vid_dev_factory* pjmedia_v4l2_factory(pj_pool_factory *pf); pjmedia_vid_dev_factory* pjmedia_qt_factory(pj_pool_factory *pf); #endif -#if PJMEDIA_VIDEO_DEV_HAS_IOS -pjmedia_vid_dev_factory* pjmedia_ios_factory(pj_pool_factory *pf); +#if PJMEDIA_VIDEO_DEV_HAS_DARWIN +pjmedia_vid_dev_factory* pjmedia_darwin_factory(pj_pool_factory *pf); #endif #if PJMEDIA_VIDEO_DEV_HAS_OPENGL @@ -105,8 +105,8 @@ PJ_DEF(pj_status_t) pjmedia_vid_dev_subsys_init(pj_pool_factory *pf) #if PJMEDIA_VIDEO_DEV_HAS_OPENGL vid_subsys->drv[vid_subsys->drv_cnt++].create = &pjmedia_opengl_factory; #endif -#if PJMEDIA_VIDEO_DEV_HAS_IOS - vid_subsys->drv[vid_subsys->drv_cnt++].create = &pjmedia_ios_factory; +#if PJMEDIA_VIDEO_DEV_HAS_DARWIN + vid_subsys->drv[vid_subsys->drv_cnt++].create = &pjmedia_darwin_factory; #endif #if PJMEDIA_VIDEO_DEV_HAS_DSHOW vid_subsys->drv[vid_subsys->drv_cnt++].create = &pjmedia_dshow_factory; |