diff options
| author | Matt Ebb <matt@mke3.net> | 2010-04-08 10:10:41 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-04-08 10:10:41 +0400 |
| commit | be3abe7b688b720b45201e6c01a1adcbb5cb6c61 (patch) | |
| tree | a796354483e60d85c29e85718c0e77749da87e51 /source/blender/imbuf/intern | |
| parent | 7693bbf48434f92e6146be7d9549f2555da65adf (diff) | |
Fix for previous FFMPEG commit, needs extra version ifdefs
Diffstat (limited to 'source/blender/imbuf/intern')
| -rw-r--r-- | source/blender/imbuf/intern/anim.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/anim.c b/source/blender/imbuf/intern/anim.c index 1a46e79470f..b3f7784b470 100644 --- a/source/blender/imbuf/intern/anim.c +++ b/source/blender/imbuf/intern/anim.c @@ -659,7 +659,8 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position) { int pos_found = 1; int filter_y = 0; -#if (LIBAVCODEC_VERSION_MAJOR >= 52) && (LIBAVCODEC_VERSION_MINOR >= 29) +#if (LIBAVCODEC_VERSION_MAJOR >= 52) && (LIBAVCODEC_VERSION_MINOR >= 29) && \ + (LIBSWSCALE_VERSION_MAJOR >= 10) && (LIBSWSCALE_VERSION_MINOR >= 0) /* The following for color space determination */ int srcRange, dstRange, brightness, contrast, saturation; int *inv_table, *table; |