summaryrefslogtreecommitdiff
path: root/pjmedia/include
diff options
context:
space:
mode:
authorLiong Sauw Ming <ming@teluu.com>2012-04-13 08:16:30 +0000
committerLiong Sauw Ming <ming@teluu.com>2012-04-13 08:16:30 +0000
commit247215c6f68a2e45454564d5af542ae024113ed2 (patch)
tree2a743ba0c7da70600e6e7a635d3668a956f21cdc /pjmedia/include
parent6661249007b351cd95d5c3b7dddd61d808078b6d (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 'pjmedia/include')
-rw-r--r--pjmedia/include/pjmedia-codec/config.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/pjmedia/include/pjmedia-codec/config.h b/pjmedia/include/pjmedia-codec/config.h
index 07f92fbc..b7e3ff45 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
/**