From: Faustino Osuna <riquedafreak@videolan.org>
Date: Wed, 27 Feb 2008 03:47:52 +0000 (+0000)
Subject: modules/ffmpeg: Compensate for latest changes made to ffmpeg include directory structure.
X-Git-Tag: 0.9.0-test0~2465
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0057e15fbf48f5cd60e4db08977530d59a7080af;p=vlc

modules/ffmpeg: Compensate for latest changes made to ffmpeg include directory structure.
---

diff --git a/modules/codec/ffmpeg/scale.c b/modules/codec/ffmpeg/scale.c
index b238bf8d63..cf9b419da0 100644
--- a/modules/codec/ffmpeg/scale.c
+++ b/modules/codec/ffmpeg/scale.c
@@ -42,7 +42,7 @@
 
 #ifdef HAVE_FFMPEG_SWSCALE_H
 #   include <ffmpeg/swscale.h>
-#elif defined(HAVE_LIBSWSCALE_TREE)
+#elif defined(HAVE_LIBSWSCALE_TREE) || defined(HAVE_SWSCALE_H)
 #   include <swscale.h>
 #endif