diff options
author | Peter Schlaile <peter@schlaile.de> | 2011-05-27 11:47:42 +0400 |
---|---|---|
committer | Peter Schlaile <peter@schlaile.de> | 2011-05-27 11:47:42 +0400 |
commit | 0381c444fdbed601248ac5c0b01702d36e1934d5 (patch) | |
tree | c48a37fe00fa0eb392b45243027680a92e93f57b /source/blender/imbuf | |
parent | 50289e62cb0357406cec2d166d81ab4db51d7cde (diff) |
== FFMPEG ==
Fixed and added additional ffmpeg cruft checking. Oh dear.
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 8 | ||||
-rw-r--r-- | source/blender/imbuf/intern/util.c | 9 |
2 files changed, 17 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index ba7d2541cae..a0051d85c5b 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -108,6 +108,14 @@ #define FFMPEG_SWSCALE_COLOR_SPACE_SUPPORT #endif +#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 + #endif //WITH_FFMPEG #ifdef WITH_REDCODE diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 879ed37cc50..3eed69f4c52 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -62,6 +62,15 @@ #include <libavformat/avformat.h> #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 + #endif #define UTIL_DEBUG 0 |