From fa9002a339d5f9b9d00c3148f4457567575fb6f2 Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Mon, 27 Oct 2008 16:35:42 +0000
Subject: [PATCH] fix ffmpeg detection.

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@122 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
 linphone/mediastreamer2/acinclude.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linphone/mediastreamer2/acinclude.m4 b/linphone/mediastreamer2/acinclude.m4
index f7294c413..d596f7f64 100644
--- a/linphone/mediastreamer2/acinclude.m4
+++ b/linphone/mediastreamer2/acinclude.m4
@@ -75,7 +75,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[
 
 		dnl check for new/old ffmpeg header file layout
 		CPPFLAGS_save=$CPPFLAGS
-		CPPFLAGS=$FFMPEG_CFLAGS
+		CPPFLAGS="$FFMPEG_CFLAGS $CPPFLAGS"
 		AC_CHECK_HEADERS(libavcodec/avcodec.h)
 		CPPFLAGS=$CPPFLAGS_save
 
@@ -94,7 +94,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[
 		dnl # include "swscale.h" // private linhone swscale.h
 		dnl #endif
 		CPPFLAGS_save=$CPPFLAGS
-		CPPFLAGS=$FFMPEG_CFLAGS
+		CPPFLAGS="$FFMPEG_CFLAGS $CPPFLAGS"
 		AC_CHECK_HEADERS(libswscale/swscale.h)
 		CPPFLAGS=$CPPFLAGS_save