[Kdenlive-devel] [PATCH] renderer avformat.h include directory

[Albert ARIBAUD]

Albert ARIBAUD a écrit :

> Marco Gittler a écrit :

>> so i think we should #include <avformat.h>
>>
>> and add to the CXXFLAGS -I /usr/include/libavformat or 
>> -I/usr/include/ffmpeg with cmake, when we found the right postion.
>>
>> i think latest ffmpeg has pkgconfig for this, but what about the older 
>> version ?
>>
>> regards marco
> 
> You're right Marco, the ffmpeg change is pretty recent. Even the stock 
> ffmpeg-devel packages in my Mandriva don't have it, only the ffmpeg svn.
> 
> I'll go back to the bench and modify the cmake instead.

Fresh out of the bench, for KDE3. I've modified the search paths to look 
for libavformat then ffmpeg directory both in /usr/local/include and in 
/usr/include (I did not modify the MLT dir as I have not verified where 
avformat.h can end up in there). I've also fixed the krender.cpp include.

KDE4 patch to follow but it's less urgent (the avformat.h include is 
commented out anyway).

-------------------------------------------------------
Index: cmake/modules/FindLIBFFMPEG.cmake
===================================================================
--- cmake/modules/FindLIBFFMPEG.cmake   (révision 2166)
+++ cmake/modules/FindLIBFFMPEG.cmake   (copie de travail)
@@ -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
  )

Index: kdenlive/krender.cpp
===================================================================
--- kdenlive/krender.cpp        (révision 2166)
+++ kdenlive/krender.cpp        (copie de travail)
@@ -25,7 +25,7 @@
  // ffmpeg Header files

  extern "C" {
-#include <ffmpeg/avformat.h>
+#include <avformat.h>
  }

  #include <iostream>
-------------------------------------------------------

Cheers,
Albert.