Changeset 5304


Ignore:
Timestamp:
May 17, 2016 4:14:36 PM (4 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:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/include/pjmedia-codec/config.h

    r5239 r5304  
    473473 * Specify if FFMPEG codecs are available. 
    474474 * 
    475  * Default: PJMEDIA_HAS_LIBAVCODEC 
     475 * Default: PJMEDIA_HAS_LIBAVFORMAT 
    476476 */ 
    477477#ifndef PJMEDIA_HAS_FFMPEG_CODEC 
    478 #   define PJMEDIA_HAS_FFMPEG_CODEC             PJMEDIA_HAS_LIBAVCODEC 
     478#   define PJMEDIA_HAS_FFMPEG_CODEC             PJMEDIA_HAS_LIBAVFORMAT 
    479479#endif 
    480480 
Note: See TracChangeset for help on using the changeset viewer.