diff options
| author | Peter Schlaile <peter@schlaile.de> | 2011-05-28 03:33:40 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2011-05-28 03:33:40 +0400 |
| commit | 42121590f4bfd65f26e8ec705a660f4cc1bd826e (patch) | |
| tree | d57d4cf5b303c81ecdd43b89d503b481d48a2be8 /intern/audaspace | |
| parent | a9467182fb00be9fb6dd276e80b69fb650b2cac3 (diff) | |
== FFMPEG ==
Added central compatibility header file, which enables blender to compile
against very old ffmpeg versions as well as very new versions using the
*NEW* API. (Old API functions are simulated using macros and inline functions)
Added a whole lot of additional checks, tested against 6 different versions
down the timeline, hopefully, now finally all is well.
Diffstat (limited to 'intern/audaspace')
| -rw-r--r-- | intern/audaspace/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/audaspace/SConscript | 2 | ||||
| -rw-r--r-- | intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index 74f483eab05..a2468d0071e 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -26,6 +26,7 @@ set(INC FX SRC ${PTHREADS_INC} ${LIBSAMPLERATE_INC} + ../ffmpeg ) set(SRC diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript index ecc94987185..67f859b0e5f 100644 --- a/intern/audaspace/SConscript +++ b/intern/audaspace/SConscript @@ -8,7 +8,7 @@ defs = [] if env['WITH_BF_FFMPEG']: sources += env.Glob('ffmpeg/*.cpp') - incs += ' ffmpeg ' + env['BF_FFMPEG_INC'] + incs += ' ffmpeg #/intern/ffmpeg ' + env['BF_FFMPEG_INC'] defs.append('WITH_FFMPEG') if env['WITH_BF_SDL']: diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp index e748235e40e..4597432e7d1 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp @@ -39,6 +39,7 @@ extern "C" { #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> +#include "ffmpeg_compat.h" } int AUD_FFMPEGReader::decode(AVPacket* packet, AUD_Buffer& buffer) |