diff options
| author | Benny Prijono <bennylp@teluu.com> | 2011-08-08 04:18:55 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2011-08-08 04:18:55 +0000 |
| commit | 75542a438b368131627d38c70d42b6d3222f069f (patch) | |
| tree | ba820e5a994586cc5a5534380b48a12ea3d1d3e7 | |
| parent | ef4141d01ca23175d9db3ddd07225b03a52697c6 (diff) | |
Misc (re #1320): fixed link error in pjmedia_test and aviplay samples if ffmpeg is not enabled
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3688 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/test/vid_codec_test.c | 4 | ||||
| -rw-r--r-- | pjsip-apps/src/samples/aviplay.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/pjmedia/src/test/vid_codec_test.c b/pjmedia/src/test/vid_codec_test.c index 41171a9a..108340ff 100644 --- a/pjmedia/src/test/vid_codec_test.c +++ b/pjmedia/src/test/vid_codec_test.c @@ -447,9 +447,11 @@ int vid_codec_test(void) if (status != PJ_SUCCESS) return -10; +#if PJMEDIA_HAS_FFMPEG_CODEC status = pjmedia_codec_ffmpeg_init(NULL, mem); if (status != PJ_SUCCESS) return -20; +#endif rc = enum_codecs(); if (rc != 0) @@ -460,7 +462,9 @@ int vid_codec_test(void) goto on_return; on_return: +#if PJMEDIA_HAS_FFMPEG_CODEC pjmedia_codec_ffmpeg_deinit(); +#endif pjmedia_vid_dev_subsys_shutdown(); pj_pool_release(pool); pj_log_set_level(orig_log_level); diff --git a/pjsip-apps/src/samples/aviplay.c b/pjsip-apps/src/samples/aviplay.c index a949256a..0682b9e9 100644 --- a/pjsip-apps/src/samples/aviplay.c +++ b/pjsip-apps/src/samples/aviplay.c @@ -491,9 +491,11 @@ 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 (status != PJ_SUCCESS) goto on_return; +#endif rc = aviplay(pool, argv[1]); @@ -507,7 +509,9 @@ static int main_func(int argc, char *argv[]) pj_thread_sleep(100); on_return: +#if PJMEDIA_HAS_FFMPEG_CODEC pjmedia_codec_ffmpeg_deinit(); +#endif pjmedia_aud_subsys_shutdown(); pjmedia_vid_dev_subsys_shutdown(); |