merged all the latest changes from 2.4 to trunk

Browse Source

...

This commit is contained in:

Vadim Pisarevsky

2012-04-13 21:50:59 +00:00

parent 020f9a6047

commit 2fd1e2ea57

416 changed files with 12852 additions and 6070 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

1102

3rdparty/include/ffmpeg_/libavformat/avformat.h vendored

File diff suppressed because it is too large Load Diff