diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2011-10-18 05:17:13 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2011-10-18 05:17:13 +0000 |
| commit | b5b11d9cc3013dff26249df8fbd9ad82bd7fe5e8 (patch) | |
| tree | 93ec347a407258983a573cae34c6dfabe6598a41 /pjmedia | |
| parent | 5586e0af18c3ba1ed079fae5901d0981fbbdf1a4 (diff) | |
Re #1390: Fixed possible compile error in ffmpeg_util.c, the new ffmpeg format PIX_FMT_GBR24P is only available in libavutil 51.20.1 onward.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3823 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia/ffmpeg_util.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pjmedia/src/pjmedia/ffmpeg_util.c b/pjmedia/src/pjmedia/ffmpeg_util.c index bfe2a48a..bd8fbb3e 100644 --- a/pjmedia/src/pjmedia/ffmpeg_util.c +++ b/pjmedia/src/pjmedia/ffmpeg_util.c @@ -34,7 +34,10 @@ 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) { PJMEDIA_FORMAT_GBRP, PIX_FMT_GBR24P}, +#endif { PJMEDIA_FORMAT_AYUV, PIX_FMT_NONE}, { PJMEDIA_FORMAT_YUY2, PIX_FMT_YUYV422}, |