# HG changeset patch # User Markus Mützel # Date 1608713017 -3600 # Wed Dec 23 09:43:37 2020 +0100 # Node ID e4ca93f1d31cf4a38149fddc592c4a0814ca2be4 # Parent 0cb8f61db7e2dfbbca0f7d2609cfd35125e2f95f Fix compilation on MacOS (bug #57938). * cap_ffmpeg_impl_ov.hpp: Avoid including a header that shadows the declaration of an Octave function (panic). diff -r 0cb8f61db7e2 -r e4ca93f1d31c src/cap_ffmpeg_impl_ov.hpp --- a/src/cap_ffmpeg_impl_ov.hpp Sat Feb 29 20:17:46 2020 +0100 +++ b/src/cap_ffmpeg_impl_ov.hpp Wed Dec 23 09:43:37 2020 +0100 @@ -136,7 +136,8 @@ #if defined __APPLE__ #include #include - #include + #include + #include #endif #endif