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 /source/blender/imbuf/intern/util.c | |
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 'source/blender/imbuf/intern/util.c')
-rw-r--r-- | source/blender/imbuf/intern/util.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 3eed69f4c52..6e5e87d7e5c 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -63,13 +63,7 @@ #include <libavdevice/avdevice.h> #include <libavutil/log.h> -#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 101)) -#define FFMPEG_HAVE_AV_DUMP_FORMAT 1 -#endif - -#ifndef FFMPEG_HAVE_AV_DUMP_FORMAT -#define av_dump_format dump_format -#endif +#include "ffmpeg_compat.h" #endif |