From 5a306678cb2afa34024b1b00a04739c94aaf12ec Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Thu, 4 Oct 2012 07:55:41 +0000 Subject: Misc (re #1562): Fixed ffmpeg codec wrapper compile error of undefined 'AVCodec::encode' (removed in the recent ffmpeg version). git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4277 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'pjmedia') diff --git a/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c b/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c index 04dc1f3d..6d1565c6 100644 --- a/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c +++ b/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c @@ -62,11 +62,16 @@ #endif #if LIBAVCODEC_VER_AT_LEAST(53,61) -/* Not sure when AVCodec::encode2 is introduced. It appears in - * libavcodec 53.61 where some codecs actually still use AVCodec::encode - * (e.g: H263, H264). - */ -# define AVCODEC_HAS_ENCODE(c) (c->encode || c->encode2) +# if LIBAVCODEC_VER_AT_LEAST(54,63) + /* Not sure when AVCodec::encode is obsoleted/removed. */ +# define AVCODEC_HAS_ENCODE(c) (c->encode2) +# else + /* Not sure when AVCodec::encode2 is introduced. It appears in + * libavcodec 53.61 where some codecs actually still use AVCodec::encode + * (e.g: H263, H264). + */ +# define AVCODEC_HAS_ENCODE(c) (c->encode || c->encode2) +# endif # define AV_OPT_SET(obj,name,val,opt) (av_opt_set(obj,name,val,opt)==0) # define AV_OPT_SET_INT(obj,name,val) (av_opt_set_int(obj,name,val,0)==0) #else -- cgit v1.2.3