Conflicts:
	modules/highgui/src/cap_ffmpeg_impl.hpp
pull/4051/head
jormansa 11 years ago committed by Dikay900
parent cb55d60f98
commit 3c2e12a744
  1. 2
      modules/videoio/src/cap_ffmpeg_impl.hpp

@ -649,7 +649,7 @@ bool CvCapture_FFMPEG::grabFrame()
int got_picture;
int count_errs = 0;
const int max_number_of_attempts = 1 << 16;
const int max_number_of_attempts = 1 << 9;
if( !ic || !video_st ) return false;

Loading…
Cancel
Save