Changeset 4808 for pjproject/trunk/pjmedia/src/pjmedia/ffmpeg_util.h

Timestamp:

Apr 1, 2014 9:47:15 AM (10 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:

• pjproject/trunk/pjmedia/src/pjmedia/ffmpeg_util.h (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/ffmpeg_util.h

@@ -38 +38 @@
 #include <libavcodec/avcodec.h>
 
-#ifndef CodecID
-  #define CodecID AVCodecID
-#endif
-
 void pjmedia_ffmpeg_add_ref();
 void pjmedia_ffmpeg_dec_ref();
@@ -52 +48 @@
 
 pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id,
-                                         enum CodecID *codec_id);
+                                         unsigned *codec_id);
 
-pj_status_t CodecID_to_pjmedia_format_id(enum CodecID codec_id,
+pj_status_t CodecID_to_pjmedia_format_id(unsigned codec_id,
                                          pjmedia_format_id *fmt_id);