--- ./source/blender/blenkernel/intern/writeffmpeg.c.old	2008-03-25 13:26:11.000000000 +0100
+++ ./source/blender/blenkernel/intern/writeffmpeg.c	2008-03-25 13:27:06.000000000 +0100
@@ -29,10 +29,10 @@
 
 #include <stdlib.h>
 
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/rational.h>
-#include <ffmpeg/swscale.h>
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavutil/rational.h>
+#include <libswscale/swscale.h>
 
 #if LIBAVFORMAT_VERSION_INT < (49 << 16)
 #define FFMPEG_OLD_FRAME_RATE 1
--- source/blender/imbuf/intern/IMB_anim.h.old	2008-03-26 01:22:32.000000000 +0100
+++ source/blender/imbuf/intern/IMB_anim.h	2008-03-26 01:22:01.000000000 +0100
@@ -79,8 +79,8 @@
 #endif /* WITH_QUICKTIME */
 
 #ifdef WITH_FFMPEG
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
 #endif
 
 #include "IMB_imbuf_types.h"
--- source/blender/imbuf/intern/anim.c.old	2008-03-26 01:28:44.000000000 +0100
+++ source/blender/imbuf/intern/anim.c	2008-03-26 01:29:15.000000000 +0100
@@ -86,10 +86,10 @@
 #include "IMB_anim5.h"
 
 #ifdef WITH_FFMPEG
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/rational.h>
-#include <ffmpeg/swscale.h>
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavutil/rational.h>
+#include <libswscale/swscale.h>
 
 #if LIBAVFORMAT_VERSION_INT < (49 << 16)
 #define FFMPEG_OLD_FRAME_RATE 1
--- source/blender/imbuf/intern/util.c.old	2008-03-26 01:52:13.000000000 +0100
+++ source/blender/imbuf/intern/util.c	2008-03-26 01:52:48.000000000 +0100
@@ -60,8 +60,8 @@
 #endif
 
 #ifdef WITH_FFMPEG
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
 
 #if LIBAVFORMAT_VERSION_INT < (49 << 16)
 #define FFMPEG_OLD_FRAME_RATE 1
--- source/blender/src/hddaudio.c.old	2008-03-26 02:04:26.000000000 +0100
+++ source/blender/src/hddaudio.c	2008-03-26 02:04:50.000000000 +0100
@@ -36,9 +36,9 @@
 #endif
 
 #ifdef WITH_FFMPEG
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/rational.h>
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavutil/rational.h>
 #if LIBAVFORMAT_VERSION_INT < (49 << 16)
 #define FFMPEG_OLD_FRAME_RATE 1
 #else
--- source/blender/src/buttons_scene.c.old	2008-03-26 02:19:19.000000000 +0100
+++ source/blender/src/buttons_scene.c	2008-03-26 02:19:45.000000000 +0100
@@ -103,8 +103,8 @@
 
 #ifdef WITH_FFMPEG
 
-#include <ffmpeg/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */
-#include <ffmpeg/avformat.h>
+#include <libavcodec/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */
+#include <libavformat/avformat.h>
 
 static int ffmpeg_preset_sel = 0;