diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2012-04-13 08:16:30 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2012-04-13 08:16:30 +0000 |
| commit | 247215c6f68a2e45454564d5af542ae024113ed2 (patch) | |
| tree | 2a743ba0c7da70600e6e7a635d3668a956f21cdc /pjsip-apps | |
| parent | 6661249007b351cd95d5c3b7dddd61d808078b6d (diff) | |
Re #1446 (misc): Change the default of PJMEDIA_HAS_FFMPEG_VID_CODEC to PJMEDIA_HAS_FFMPEG_CODEC.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4051 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
| -rw-r--r-- | pjsip-apps/src/samples/aviplay.c | 8 | ||||
| -rw-r--r-- | pjsip-apps/src/samples/simpleua.c | 10 | ||||
| -rw-r--r-- | pjsip-apps/src/samples/vid_streamutil.c | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/pjsip-apps/src/samples/aviplay.c b/pjsip-apps/src/samples/aviplay.c index 98b0bb13..a4d92764 100644 --- a/pjsip-apps/src/samples/aviplay.c +++ b/pjsip-apps/src/samples/aviplay.c @@ -500,8 +500,8 @@ static int main_func(int argc, char *argv[]) goto on_return; } -#if PJMEDIA_HAS_FFMPEG_CODEC - status = pjmedia_codec_ffmpeg_init(NULL, &cp.factory); +#if PJMEDIA_HAS_FFMPEG_VID_CODEC + status = pjmedia_codec_ffmpeg_vid_init(NULL, &cp.factory); if (status != PJ_SUCCESS) goto on_return; #endif @@ -518,8 +518,8 @@ static int main_func(int argc, char *argv[]) pj_thread_sleep(100); on_return: -#if PJMEDIA_HAS_FFMPEG_CODEC - pjmedia_codec_ffmpeg_deinit(); +#if PJMEDIA_HAS_FFMPEG_VID_CODEC + pjmedia_codec_ffmpeg_vid_deinit(); #endif pjmedia_aud_subsys_shutdown(); pjmedia_vid_dev_subsys_shutdown(); diff --git a/pjsip-apps/src/samples/simpleua.c b/pjsip-apps/src/samples/simpleua.c index 58cde4c0..68c50b9b 100644 --- a/pjsip-apps/src/samples/simpleua.c +++ b/pjsip-apps/src/samples/simpleua.c @@ -385,11 +385,11 @@ int main(int argc, char *argv[]) status = pjmedia_vid_dev_subsys_init(&cp.factory); PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1); -# if defined(PJMEDIA_HAS_FFMPEG_CODEC) && PJMEDIA_HAS_FFMPEG_CODEC!=0 +# if defined(PJMEDIA_HAS_FFMPEG_VID_CODEC) && PJMEDIA_HAS_FFMPEG_VID_CODEC!=0 /* Init ffmpeg video codecs */ - status = pjmedia_codec_ffmpeg_init(NULL, &cp.factory); + status = pjmedia_codec_ffmpeg_vid_init(NULL, &cp.factory); PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1); -# endif /* PJMEDIA_HAS_FFMPEG_CODEC */ +# endif /* PJMEDIA_HAS_FFMPEG_VID_CODEC */ #endif /* PJMEDIA_HAS_VIDEO */ @@ -573,8 +573,8 @@ int main(int argc, char *argv[]) pjmedia_vid_stream_destroy(g_med_vstream); /* Deinit ffmpeg codec */ -# if defined(PJMEDIA_HAS_FFMPEG_CODEC) && PJMEDIA_HAS_FFMPEG_CODEC!=0 - pjmedia_codec_ffmpeg_deinit(); +# if defined(PJMEDIA_HAS_FFMPEG_VID_CODEC) && PJMEDIA_HAS_FFMPEG_VID_CODEC!=0 + pjmedia_codec_ffmpeg_vid_deinit(); # endif #endif diff --git a/pjsip-apps/src/samples/vid_streamutil.c b/pjsip-apps/src/samples/vid_streamutil.c index 12280218..b8403f1f 100644 --- a/pjsip-apps/src/samples/vid_streamutil.c +++ b/pjsip-apps/src/samples/vid_streamutil.c @@ -121,8 +121,8 @@ static pj_status_t init_codecs(pj_pool_factory *pf) /* To suppress warning about unused var when all codecs are disabled */ PJ_UNUSED_ARG(status); -#if defined(PJMEDIA_HAS_FFMPEG_CODEC) && PJMEDIA_HAS_FFMPEG_CODEC != 0 - status = pjmedia_codec_ffmpeg_init(NULL, pf); +#if defined(PJMEDIA_HAS_FFMPEG_VID_CODEC) && PJMEDIA_HAS_FFMPEG_VID_CODEC != 0 + status = pjmedia_codec_ffmpeg_vid_init(NULL, pf); PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); #endif @@ -134,8 +134,8 @@ static pj_status_t init_codecs(pj_pool_factory *pf) */ static void deinit_codecs() { -#if defined(PJMEDIA_HAS_FFMPEG_CODEC) && PJMEDIA_HAS_FFMPEG_CODEC != 0 - pjmedia_codec_ffmpeg_deinit(); +#if defined(PJMEDIA_HAS_FFMPEG_VID_CODEC) && PJMEDIA_HAS_FFMPEG_VID_CODEC != 0 + pjmedia_codec_ffmpeg_vid_deinit(); #endif } |