Changeset 5304 for pjproject/trunk/pjmedia/include/pjmedia-codec/config.h

Timestamp:

May 17, 2016 4:14:36 PM (8 years ago)

Author:

riza

Message:

Re #1920: Check for libavformat instead of libavcodec when setting
PJMEDIA_HAS_FFMPEG_CODEC.

ffmpeg_vid_codecs.c has a compile-time guard of PJMEDIA_HAS_FFMPEG_VID_CODEC
which is PJMEDIA_HAS_FFMPEG_CODEC which is PJMEDIA_HAS_LIBAVCODEC.
However, the code requires libavutil, libavcodec, and libavformat.
In Ubuntu (and Debian), the package libavformat-dev contains
libavcodec-dev and libavutil-dev.
Not the other way around. Therefore, the current compile-time guard is
not sufficient and should check PJMEDIA_HAS_LIBAVFORMAT instead.

Thanks to Alexander Traud for the patch.

File:

• pjproject/trunk/pjmedia/include/pjmedia-codec/config.h (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia-codec/config.h

@@ -473 +473 @@
  * Specify if FFMPEG codecs are available.
  *
- * Default: PJMEDIA_HAS_LIBAVCODEC
+ * Default: PJMEDIA_HAS_LIBAVFORMAT
  */
 #ifndef PJMEDIA_HAS_FFMPEG_CODEC
-#   define PJMEDIA_HAS_FFMPEG_CODEC             PJMEDIA_HAS_LIBAVCODEC
+#   define PJMEDIA_HAS_FFMPEG_CODEC             PJMEDIA_HAS_LIBAVFORMAT
 #endif