fix ffmpeg include path

svn path=/branches/KDE4/; revision=2168

diff --git a/cmake/modules/FindLIBFFMPEG.cmake b/cmake/modules/FindLIBFFMPEG.cmake
index 36bef70cbc9804682ae3b7ca6936bb079f953967..fc344411f5ab1add5c8f638ec107d91da30cd61d 100644 (file)
--- a/cmake/modules/FindLIBFFMPEG.cmake
+++ b/cmake/modules/FindLIBFFMPEG.cmake
@@ -3,8 +3,8 @@
 #
 
 FIND_PATH(LIBFFMPEG_INCLUDE_DIR 
-  NAMES ffmpeg/avformat.h
-  PATHS ${MLT_PATH}/include /usr/local/include /usr/include
+  NAMES avformat.h
+  PATHS ${MLT_PATH}/include /usr/local/include/libavformat /usr/local/include/ffmpeg /usr/include/libavformat /usr/include/ffmpeg
   NO_DEFAULT_PATH
 )
 

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 389577d541b0a4db7b0f57fc82ad30bced8f9c04..823b3b2fb698edabedc8fca12a2ba9c9d08d240b 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -25,7 +25,7 @@
 // ffmpeg Header files
 
 extern "C" {
-#include <libavformat/avformat.h>
+#include <avformat.h>
 }
 #include <QTimer>
 #include <QDir>