svn merge ^/trunk/blender -r47961:48070
[blender.git] / intern / ffmpeg /
drwxr-xr-x   ..
-rw-r--r-- 5723 ffmpeg_compat.h