diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2007-12-25 09:48:45 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2007-12-25 09:48:45 +0300 |
| commit | 139cb3c0bc371bbc1740b6938bb61c9f80dbaadb (patch) | |
| tree | 76c6a13ba8237a242daff53bc9f90980d55325bc /config | |
| parent | 9b45ead730328a37ab17c70c51d9d09bb39adcac (diff) | |
=Scons ffmpeg update and avi fix=
Updated scons to work with the ffmpeg binaries in
lib/windows/gcc again. Also fixed a bug reported by
Debolaz on irc. Blender's internal avi reading (which can
only read simple formats like motion jpeg) was telling the
video code it could read all avis, without checking their
codec.
To fix this, I copied AVI_open_movie(), and modified it to
to replace AVI_is_avi(). Now it properly checks the codec,
and validates the header.
Diffstat (limited to 'config')
| -rw-r--r-- | config/win32-mingw-config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 54d8e0c6ffd..8f8c30d46b0 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -18,7 +18,7 @@ BF_OPENAL_LIB = 'openal_static' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' WITH_BF_FFMPEG = 'false' -BF_FFMPEG_LIB = 'avformat avutil avcodec' +BF_FFMPEG_LIB = 'xvidcore x264 avutil avformat avutil swscale avcodec avutil xvidcore x264' BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib' BF_FFMPEG_INC = LIBDIR + '/gcc/ffmpeg/include' |