diff options
| author | Benny Prijono <bennylp@teluu.com> | 2011-10-24 06:50:34 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2011-10-24 06:50:34 +0000 |
| commit | 71b1514952b31e16965f772cac55c5babd42508b (patch) | |
| tree | 3dfdec6b69b5914de21b5acb6f4ccfeb84a963da /pjmedia | |
| parent | fe5afaa1c5e16a77ab1ab95ae45e917d89785af3 (diff) | |
Misc (re #1393): fixed wrong libavutil version detection
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3839 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia/ffmpeg_util.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pjmedia/src/pjmedia/ffmpeg_util.c b/pjmedia/src/pjmedia/ffmpeg_util.c index bd8fbb3e..973022c8 100644 --- a/pjmedia/src/pjmedia/ffmpeg_util.c +++ b/pjmedia/src/pjmedia/ffmpeg_util.c @@ -24,6 +24,14 @@ #include "ffmpeg_util.h" #include <libavformat/avformat.h> +#define MAKE_VER(mj,mn,mi) ((mj << 16) | (mn << 8) | (mi << 0)) +#define VER_AT_LEAST(mj,mn,mi) (MAKE_VER(LIBAVUTIL_VERSION_MAJOR, \ + LIBAVUTIL_VERSION_MINOR, \ + LIBAVUTIL_VERSION_MICRO) >= \ + MAKE_VER(mj,mn,mi)) + + + /* Conversion table between pjmedia_format_id and PixelFormat */ static const struct ffmpeg_fmt_table_t { @@ -34,8 +42,7 @@ static const struct ffmpeg_fmt_table_t { PJMEDIA_FORMAT_RGBA, PIX_FMT_RGBA}, { PJMEDIA_FORMAT_RGB24,PIX_FMT_BGR24}, { PJMEDIA_FORMAT_BGRA, PIX_FMT_BGRA}, -#if (LIBAVUTIL_VERSION_MAJOR >= 51) && (LIBAVUTIL_VERSION_MINOR >= 20) && \ - (LIBAVUTIL_VERSION_MICRO >= 1) +#if VER_AT_LEAST(51,20,1) { PJMEDIA_FORMAT_GBRP, PIX_FMT_GBR24P}, #endif |