Re #1446 (misc): Change the default of PJMEDIA_HAS_FFMPEG_VID_CODEC to PJMEDIA_HAS_FFMPEG_CODEC.
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@4051 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjmedia/include/pjmedia-codec/config.h b/pjmedia/include/pjmedia-codec/config.h
index 07f92fb..b7e3ff4 100644
--- a/pjmedia/include/pjmedia-codec/config.h
+++ b/pjmedia/include/pjmedia-codec/config.h
@@ -378,12 +378,22 @@
/**
- * Specify if FFMPEG video codecs are available.
+ * Specify if FFMPEG codecs are available.
*
* Default: PJMEDIA_HAS_LIBAVCODEC
*/
+#ifndef PJMEDIA_HAS_FFMPEG_CODEC
+# define PJMEDIA_HAS_FFMPEG_CODEC PJMEDIA_HAS_LIBAVCODEC
+#endif
+
+
+/**
+ * Specify if FFMPEG video codecs are available.
+ *
+ * Default: PJMEDIA_HAS_FFMPEG_CODEC
+ */
#ifndef PJMEDIA_HAS_FFMPEG_VID_CODEC
-# define PJMEDIA_HAS_FFMPEG_VID_CODEC PJMEDIA_HAS_LIBAVCODEC
+# define PJMEDIA_HAS_FFMPEG_VID_CODEC PJMEDIA_HAS_FFMPEG_CODEC
#endif
/**
diff --git a/pjsip-apps/src/samples/aviplay.c b/pjsip-apps/src/samples/aviplay.c
index 98b0bb1..a4d9276 100644
--- a/pjsip-apps/src/samples/aviplay.c
+++ b/pjsip-apps/src/samples/aviplay.c
@@ -500,8 +500,8 @@
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 @@
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 58cde4c..68c50b9 100644
--- a/pjsip-apps/src/samples/simpleua.c
+++ b/pjsip-apps/src/samples/simpleua.c
@@ -385,11 +385,11 @@
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 @@
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 1228021..b8403f1 100644
--- a/pjsip-apps/src/samples/vid_streamutil.c
+++ b/pjsip-apps/src/samples/vid_streamutil.c
@@ -121,8 +121,8 @@
/* 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 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
}
diff --git a/pjsip/src/pjsua-lib/pjsua_vid.c b/pjsip/src/pjsua-lib/pjsua_vid.c
index b8ece7a..daec253 100644
--- a/pjsip/src/pjsua-lib/pjsua_vid.c
+++ b/pjsip/src/pjsua-lib/pjsua_vid.c
@@ -73,8 +73,8 @@
goto on_error;
}
-#if PJMEDIA_HAS_VIDEO && PJMEDIA_HAS_FFMPEG_CODEC
- status = pjmedia_codec_ffmpeg_init(NULL, &pjsua_var.cp.factory);
+#if PJMEDIA_HAS_VIDEO && PJMEDIA_HAS_FFMPEG_VID_CODEC
+ status = pjmedia_codec_ffmpeg_vid_init(NULL, &pjsua_var.cp.factory);
if (status != PJ_SUCCESS) {
PJ_PERROR(1,(THIS_FILE, status,
"Error initializing ffmpeg library"));
@@ -129,8 +129,8 @@
pjmedia_vid_dev_subsys_shutdown();
-#if PJMEDIA_HAS_FFMPEG_CODEC
- pjmedia_codec_ffmpeg_deinit();
+#if PJMEDIA_HAS_FFMPEG_VID_CODEC
+ pjmedia_codec_ffmpeg_vid_deinit();
#endif
if (pjmedia_vid_codec_mgr_instance())