summaryrefslogtreecommitdiff
path: root/pjmedia/src/pjmedia/converter.c
diff options
context:
space:
mode:
authorJason Parker <jparker@digium.com>2013-03-11 15:09:56 -0500
committerJason Parker <jparker@digium.com>2013-03-11 15:09:56 -0500
commit483805f79570115ab95c69698792d238c1719b1b (patch)
tree6b53ab2fd2b2478f864ccc8bd1b0bfaedc4d2050 /pjmedia/src/pjmedia/converter.c
parentf3ab456a17af1c89a6e3be4d20c5944853df1cb0 (diff)
Import pjproject-2.1
Diffstat (limited to 'pjmedia/src/pjmedia/converter.c')
-rw-r--r--pjmedia/src/pjmedia/converter.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/pjmedia/src/pjmedia/converter.c b/pjmedia/src/pjmedia/converter.c
index 50fbcc8..19a8a8c 100644
--- a/pjmedia/src/pjmedia/converter.c
+++ b/pjmedia/src/pjmedia/converter.c
@@ -1,4 +1,4 @@
-/* $Id: converter.c 4087 2012-04-26 03:39:24Z ming $ */
+/* $Id: converter.c 4412 2013-03-05 03:12:32Z riza $ */
/*
* Copyright (C) 2010-2011 Teluu Inc. (http://www.teluu.com)
*
@@ -39,7 +39,9 @@ PJ_DEF(pj_status_t) pjmedia_converter_mgr_create(pj_pool_t *pool,
pjmedia_converter_mgr **p_mgr)
{
pjmedia_converter_mgr *mgr;
+#if PJMEDIA_HAS_LIBSWSCALE && PJMEDIA_HAS_LIBAVUTIL
pj_status_t status = PJ_SUCCESS;
+#endif
mgr = PJ_POOL_ALLOC_T(pool, pjmedia_converter_mgr);
pj_list_init(&mgr->factory_list);