From be3abe7b688b720b45201e6c01a1adcbb5cb6c61 Mon Sep 17 00:00:00 2001 From: Matt Ebb Date: Thu, 8 Apr 2010 06:10:41 +0000 Subject: Fix for previous FFMPEG commit, needs extra version ifdefs --- source/blender/imbuf/intern/anim.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/imbuf/intern') 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; -- cgit v1.2.3