--- mediastreamer2/src/videoenc.c~	2008-01-24 10:08:46.000000000 +0100
+++ mediastreamer2/src/videoenc.c	2008-05-28 17:05:21.000000000 +0200
@@ -17,7 +17,7 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
 #include "mediastreamer2/msfilter.h"
 #include "mediastreamer2/msvideo.h"
 #include "mediastreamer2/msticker.h"
--- mediastreamer2/src/videodec.c~	2007-11-15 14:51:32.000000000 +0100
+++ mediastreamer2/src/videodec.c	2008-05-28 17:08:04.000000000 +0200
@@ -17,8 +17,8 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/swscale.h>
+#include <libavcodec/avcodec.h>
+#include <libswscale/swscale.h>
 
 #include "mediastreamer2/msfilter.h"
 #include "mediastreamer2/msvideo.h"
--- mediastreamer2/src/nowebcam.c~	2008-05-28 17:11:29.000000000 +0200
+++ mediastreamer2/src/nowebcam.c	2008-05-28 17:20:56.000000000 +0200
@@ -1,8 +1,8 @@
 #include "mediastreamer2/mscommon.h"
 #include "mediastreamer2/msvideo.h"
 
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/swscale.h>
+#include <libavcodec/avcodec.h>
+#include <libswscale/swscale.h>
 
 
 #ifdef HAVE_CONFIG_H
--- mediastreamer2/src/pixconv.c~	2007-11-16 15:29:43.000000000 +0100
+++ mediastreamer2/src/pixconv.c	2008-05-28 17:21:52.000000000 +0200
@@ -20,8 +20,8 @@
 #include "mediastreamer2/msfilter.h"
 #include "mediastreamer2/msvideo.h"
 
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/swscale.h>
+#include <libavcodec/avcodec.h>
+#include <libswscale/swscale.h>
 
 extern void ms_ffmpeg_check_init();
 
--- mediastreamer2/src/sizeconv.c~	2008-01-13 21:56:56.000000000 +0100
+++ mediastreamer2/src/sizeconv.c	2008-05-28 17:22:50.000000000 +0200
@@ -21,8 +21,8 @@
 #include "mediastreamer2/msticker.h"
 #include "mediastreamer2/msvideo.h"
 
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/swscale.h>
+#include <libavcodec/avcodec.h>
+#include <libswscale/swscale.h>
 
 typedef struct SizeConvState{
 	MSVideoSize target_vsize;
--- mediastreamer2/src/videoout.c~	2008-01-25 15:41:12.000000000 +0100
+++ mediastreamer2/src/videoout.c	2008-05-28 17:24:24.000000000 +0200
@@ -21,9 +21,9 @@
 #include "mediastreamer2/msvideo.h"
 #include "mediastreamer2/msvideoout.h"
 
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/swscale.h>
-#include <ffmpeg/avutil.h>
+#include <libavcodec/avcodec.h>
+#include <libswscale/swscale.h>
+#include <libavutil/avutil.h>
 
 static int video_out_handle_resize(MSFilter *f, void *arg);
 
--- mediastreamer2/src/wincevideods.c~	2007-12-20 00:26:12.000000000 +0100
+++ mediastreamer2/src/wincevideods.c	2008-05-28 17:29:51.000000000 +0200
@@ -27,7 +27,7 @@
 #include <aygshell.h>
 #include "nowebcam.h"
 #if 0
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
 #endif
 
 #include <dshow.h>
--- mediastreamer2/src/winvideods.c~	2008-01-13 21:56:57.000000000 +0100
+++ mediastreamer2/src/winvideods.c	2008-05-28 17:34:03.000000000 +0200
@@ -26,7 +26,7 @@
 #include "mediastreamer2/msv4l.h"
 
 #include "nowebcam.h"
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
 
 #include <dshow.h>
 #include <dmodshow.h>