Ticket #1750: ffmpeg_fix.diff

pjmedia/src/pjmedia/ffmpeg_util.c

@@ -26 +26 @@
 #include "ffmpeg_util.h"
 #include <libavformat/avformat.h>
 
-#define MAKE_VER(mj,mn,mi)      ((mj << 16) | (mn << 8) | (mi << 0))
-#define VER_AT_LEAST(mj,mn,mi)  (MAKE_VER(LIBAVUTIL_VERSION_MAJOR, \
-                                          LIBAVUTIL_VERSION_MINOR, \
-                                          LIBAVUTIL_VERSION_MICRO) >= \
-                                 MAKE_VER(mj,mn,mi))
-
-
 
 /* Conversion table between pjmedia_format_id and PixelFormat */
 static const struct ffmpeg_fmt_table_t
@@ -44 +37 @@
     { PJMEDIA_FORMAT_RGBA, PIX_FMT_RGBA},
     { PJMEDIA_FORMAT_RGB24,PIX_FMT_BGR24},
     { PJMEDIA_FORMAT_BGRA, PIX_FMT_BGRA},
-#if VER_AT_LEAST(51,20,1)
+#if LIBAVUTIL_BUILD >= PJ_CALC_FFMPEG_VERSION(51,20,1)
     { PJMEDIA_FORMAT_GBRP, PIX_FMT_GBR24P},
 #endif
 

pjmedia/src/pjmedia/ffmpeg_util.h

@@ -37 +37 @@
 #include <libavutil/avutil.h>
 #include <libavcodec/avcodec.h>
 
+#define PJ_CALC_FFMPEG_VERSION(mj,mn,mi) ((mj << 16) | (mn << 8) | (mi << 0))
+
+#if LIBAVCODEC_BUILD >= PJ_CALC_FFMPEG_VERSION(54,25,0)
+    #define CodecID AVCodecID
+#endif
+
 void pjmedia_ffmpeg_add_ref();
 void pjmedia_ffmpeg_dec_ref();