OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0029112: Visualization - compilation fails on Ubuntu with libavutil 54.x (FFmpeg 2.7.6)

Browse Source 
Offending macro is undefined to allow compilation with libavutil 54.x
This commit is contained in:
abv 2017-09-15 08:35:07 +03:00 committed by bugmaster
parent ad8b073e19
commit 746f3d7ab2
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Image/Image_VideoRecorder.cxx
View File

@ -51,6 +51,13 @@ extern "C"
#endif #endif
}; };
// Undefine macro that clashes with name used by field of Image_VideoParams;
// this macro is defined in headers of older versions of libavutil
// (see definition of macro FF_API_PIX_FMT in version.h)
#ifdef PixelFormat
#undef PixelFormat
#endif
#endif #endif
IMPLEMENT_STANDARD_RTTIEXT(Image_VideoRecorder, Standard_Transient) IMPLEMENT_STANDARD_RTTIEXT(Image_VideoRecorder, Standard_Transient)

7
src/Image/Image_VideoRecorder.hxx
View File

@ -28,6 +28,13 @@ struct AVCodec;
struct AVFrame; struct AVFrame;
struct SwsContext; struct SwsContext;
// Undefine macro that clashes with name used by field of Image_VideoParams;
// this macro is defined in headers of older versions of libavutil
// (see definition of macro FF_API_PIX_FMT in version.h)
#ifdef PixelFormat
#undef PixelFormat
#endif
//! Auxiliary structure defining video parameters. //! Auxiliary structure defining video parameters.
//! Please refer to FFmpeg documentation for defining text values. //! Please refer to FFmpeg documentation for defining text values.
struct Image_VideoParams struct Image_VideoParams