Campbell Barton 15e6d6cd75 svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

..

ffmpeg_compat.h

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00