diff options
| author | Riza Sulistyo <riza@teluu.com> | 2016-05-17 16:14:36 +0000 |
|---|---|---|
| committer | Riza Sulistyo <riza@teluu.com> | 2016-05-17 16:14:36 +0000 |
| commit | 0c7a1290de08413eedd14a0cd54856ecbaa63035 (patch) | |
| tree | e84fbb9398ab356cd207d6638ee11d7eec3b05ef | |
| parent | 7e96ebd5c19e3815f0858420bc842e6d9a2a0a2f (diff) | |
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.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5304 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/include/pjmedia-codec/config.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pjmedia/include/pjmedia-codec/config.h b/pjmedia/include/pjmedia-codec/config.h index 9a69099f..d0235598 100644 --- a/pjmedia/include/pjmedia-codec/config.h +++ b/pjmedia/include/pjmedia-codec/config.h @@ -472,10 +472,10 @@ /** * 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 |