propagated some fixes from 2.3 to trunk

2011-06-23 12:00:09 +00:00
parent d4fbb2c4fb
commit 49467947ac
26 changed files with 378 additions and 318 deletions
--- a/modules/highgui/src/cap_ffmpeg.cpp
+++ b/modules/highgui/src/cap_ffmpeg.cpp
@@ -433,7 +433,9 @@ bool CvCapture_FFMPEG::reopen()
    return true;
 }

-
+#ifndef AVSEEK_FLAG_FRAME
+	#define AVSEEK_FLAG_FRAME 0
+#endif

 bool CvCapture_FFMPEG::open( const char* _filename )
 {