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/doc/reading_and_writing_images_and_video.rst
+++ b/modules/highgui/doc/reading_and_writing_images_and_video.rst
@@ -366,5 +366,6 @@ Video writer class ::
        ...
    };

+For more detailed description see http://opencv.willowgarage.com/wiki/documentation/cpp/highgui/VideoWriter
 ..