diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-27 14:51:03 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-27 14:52:59 +0400 |
| commit | d3a73d0845834801608e8d47f372851973724e2c (patch) | |
| tree | 0c8fc178355b3411b51cabf5f66da7c09ea7026e /source/creator | |
| parent | 688257d1a28e980e058b702520aac4885668f0fd (diff) | |
Windows: Upgrade FFmpeg from 0.10 to 2.1.4
Fixes T39423: Blender crashes on iv41 encoded videos in thumbnail display mode
Libraries are still being committed to the svn, so compilation might be broken
for a while. Sorry for this, but can't really be avoided.
Also, some typos in scons are possible.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index e9a248d123d..94ec2330291 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -663,10 +663,10 @@ elseif(WIN32) else() install( FILES - ${LIBDIR}/ffmpeg/lib/avcodec-53.dll - ${LIBDIR}/ffmpeg/lib/avformat-53.dll - ${LIBDIR}/ffmpeg/lib/avdevice-53.dll - ${LIBDIR}/ffmpeg/lib/avutil-51.dll + ${LIBDIR}/ffmpeg/lib/avcodec-55.dll + ${LIBDIR}/ffmpeg/lib/avformat-55.dll + ${LIBDIR}/ffmpeg/lib/avdevice-55.dll + ${LIBDIR}/ffmpeg/lib/avutil-52.dll ${LIBDIR}/ffmpeg/lib/swscale-2.dll DESTINATION ${TARGETDIR} ) |