Merge pull request #6689 from ilya-lavrenov:il/fix

aa861520 · Alexander Alekhin · 77849d00 · e0d64df7 · aa861520
Commit aa861520 authored Jun 16, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

No files found.
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
@@ -2287,7 +2287,8 @@ bool OutputMediaStream_FFMPEG::open(const char* fileName, int width, int height,
    #if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 2, 0)
        av_write_header(oc_);
    #else
-        avformat_write_header(oc_, NULL);
+        if (avformat_write_header(oc_, NULL) != 0)
+            return false;
    #endif

    return true;