Changeset 4277


Ignore:
Timestamp:
Oct 4, 2012 7:55:41 AM (8 years ago)
Author:
nanang
Message:

Misc (re #1562): Fixed ffmpeg codec wrapper compile error of undefined 'AVCodec::encode' (removed in the recent ffmpeg version).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c

    r4089 r4277  
    6363 
    6464#if LIBAVCODEC_VER_AT_LEAST(53,61) 
    65 /* Not sure when AVCodec::encode2 is introduced. It appears in  
    66  * libavcodec 53.61 where some codecs actually still use AVCodec::encode 
    67  * (e.g: H263, H264). 
    68  */ 
    69 #  define AVCODEC_HAS_ENCODE(c)         (c->encode || c->encode2) 
     65#  if LIBAVCODEC_VER_AT_LEAST(54,63) 
     66   /* Not sure when AVCodec::encode is obsoleted/removed. */ 
     67#      define AVCODEC_HAS_ENCODE(c)     (c->encode2) 
     68#  else 
     69   /* Not sure when AVCodec::encode2 is introduced. It appears in  
     70    * libavcodec 53.61 where some codecs actually still use AVCodec::encode 
     71    * (e.g: H263, H264). 
     72    */ 
     73#      define AVCODEC_HAS_ENCODE(c)     (c->encode || c->encode2) 
     74#  endif 
    7075#  define AV_OPT_SET(obj,name,val,opt)  (av_opt_set(obj,name,val,opt)==0) 
    7176#  define AV_OPT_SET_INT(obj,name,val)  (av_opt_set_int(obj,name,val,0)==0) 
Note: See TracChangeset for help on using the changeset viewer.