mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 06:03:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrey Kamaev 2013-02-12 20:29:02 +04:00 committed by OpenCV Buildbot
commit ca5e6f9522
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/highgui/src/cap_ffmpeg_impl.hpp
View File

@ -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
if (ret < 0) if (ret < 0)
{ {
if (ret == AVERROR_EOF) if (ret == (int)AVERROR_EOF)
*endOfFile = true; *endOfFile = true;
return false; return false;
} }