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 /CMakeLists.txt | |
| 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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eaa41467e5d..a29da367040 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1162,8 +1162,8 @@ elseif(WIN32) set(FFMPEG_LIBRARY_VERSION 54) set(FFMPEG_LIBRARY_VERSION_AVU 52) else() - set(FFMPEG_LIBRARY_VERSION 53) - set(FFMPEG_LIBRARY_VERSION_AVU 51) + set(FFMPEG_LIBRARY_VERSION 55) + set(FFMPEG_LIBRARY_VERSION_AVU 52) endif() set(FFMPEG_LIBRARIES ${LIBDIR}/ffmpeg/lib/avcodec-${FFMPEG_LIBRARY_VERSION}.lib |