Changeset 5513 for pjproject/branches/projects/uwp/pjmedia/src/pjmedia/ffmpeg_util.h

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/ffmpeg_util.h (modified) (1 diff)

pjproject/branches/projects/uwp/pjmedia/src/pjmedia/ffmpeg_util.h

@@ -38 +38 @@
 #include <libavcodec/avcodec.h>
 
+
+#ifdef PJMEDIA_USE_OLD_FFMPEG
+#   define AVPixelFormat        PixelFormat
+#   define AV(str)              str
+#   define PIX_FMT_GBRP         PIX_FMT_GBR24P
+#else
+#   define AV(str)              AV_ ## str
+#endif
+                                         
+
 void pjmedia_ffmpeg_add_ref();
 void pjmedia_ffmpeg_dec_ref();