Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Windows: Upgrade FFmpeg from 0.10 to 2.1.4

Browse Source 
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.
This commit is contained in:
Sergey Sharybin
2014-03-27 16:51:03 +06:00
parent 688257d1a2
commit d3a73d0845
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -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