From ac389507a0338551e1b4bdad3b6804e5110c5df5 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Tue, 12 Feb 2013 19:58:59 +0400 Subject: [PATCH] Fix warnings from ffmpeg wrapper --- modules/highgui/src/cap_ffmpeg_impl.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp index 445a9e6208..a6952a2cba 100644 --- a/modules/highgui/src/cap_ffmpeg_impl.hpp +++ b/modules/highgui/src/cap_ffmpeg_impl.hpp @@ -49,6 +49,10 @@ #pragma warning( disable: 4244 4510 4512 4610 ) #endif +#ifdef __GNUC__ +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + #ifdef __cplusplus extern "C" { #endif @@ -2054,7 +2058,7 @@ bool InputMediaStream_FFMPEG::read(unsigned char** data, int* size, int* endOfFi if (ret < 0) { - if (ret == AVERROR_EOF) + if (ret == (int)AVERROR_EOF) *endOfFile = true; return false; }