merged the latest fixes in 2.3 to trunk

Browse Source

...

This commit is contained in:

Vadim Pisarevsky

2011-07-04 16:18:12 +00:00

parent 55ba0af2bc

commit b33224f0b6

29 changed files with 1930 additions and 2943 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

modules/highgui/src/cap_ffmpeg.cpp

+178 -1306

File diff suppressed because it is too large Load Diff