Merge pull request #5454 from alalek:fix_ffmpeg_priv_data

6025738b · Alexander Alekhin · 7a4b2e18 · 4760d329 · 6025738b
Commit 6025738b authored Oct 06, 2015 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

No files found.
--- a/modules/videoio/src/cap_ffmpeg_impl.hpp
+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
@@ -1274,7 +1274,8 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatContext *oc,
      c->gop_size = -1;
      c->qmin = -1;
      c->bit_rate = 0;
-      av_opt_set(c->priv_data,"crf","23", 0);
+      if (c->priv_data)
+          av_opt_set(c->priv_data,"crf","23", 0);
    }
 #endif