Skip to content

O
opencv
Commit ca5e6f95 authored by Andrey Kamaev's avatar Andrey Kamaev Committed by OpenCV Buildbot
Browse files
Options

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

parents 8b7a28a7 ac389507
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
modules/highgui/src/cap_ffmpeg_impl.hpp
View file @ ca5e6f95
...@@ -49,6 +49,10 @@ ...@@ -49,6 +49,10 @@
#pragma warning( disable: 4244 4510 4512 4610 ) #pragma warning( disable: 4244 4510 4512 4610 )
#endif #endif
#ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
...@@ -2054,7 +2058,7 @@ bool InputMediaStream_FFMPEG::read(unsigned char** data, int* size, int* endOfFi ...@@ -2054,7 +2058,7 @@ bool InputMediaStream_FFMPEG::read(unsigned char** data, int* size, int* endOfFi
if (ret < 0) if (ret < 0)
{ {
if (ret == AVERROR_EOF) if (ret == (int)AVERROR_EOF)
*endOfFile = true; *endOfFile = true;
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment