Merge pull request #480 from taka-no-me:ffmpeg_warnings

ca5e6f95 · Andrey Kamaev · OpenCV Buildbot · 8b7a28a7 · ac389507 · ca5e6f95
Commit ca5e6f95 authored Feb 12, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Feb 12, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

cap_ffmpeg_impl.hpp modules/highgui/src/cap_ffmpeg_impl.hpp +5 -1

No files found.
--- 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;
        }