Ignore:
Timestamp:
Apr 1, 2014 9:47:15 AM (8 years ago)
Author:
nanang
Message:

Re #1750:

  • Replaced "enum CodecID" with "unsigned" (previous fix raised compile error for some older ffmpeg versions).
  • Handled PIX_FMT_GBR24P hassle.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia/ffmpeg_util.h

    r4801 r4808  
    3838#include <libavcodec/avcodec.h> 
    3939 
    40 #ifndef CodecID 
    41   #define CodecID AVCodecID 
    42 #endif 
    43  
    4440void pjmedia_ffmpeg_add_ref(); 
    4541void pjmedia_ffmpeg_dec_ref(); 
     
    5248 
    5349pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id, 
    54                                          enum CodecID *codec_id); 
     50                                         unsigned *codec_id); 
    5551 
    56 pj_status_t CodecID_to_pjmedia_format_id(enum CodecID codec_id, 
     52pj_status_t CodecID_to_pjmedia_format_id(unsigned codec_id, 
    5753                                         pjmedia_format_id *fmt_id); 
    5854 
Note: See TracChangeset for help on using the changeset viewer.