*** FindFFMPEGBerk.cmake	2009-12-01 17:49:13.000000000 -0500
--- FindFFMPEGArnaud.cmake	2009-12-02 10:13:57.000000000 -0500
***************
*** 12,19 ****
  # if needed to FFMPEG_LIBRARIES if ffmpeg ever changes...
  
! FIND_PATH(FFMPEG_INCLUDE_DIR ffmpeg/avformat.h
    /usr/local/include
    /usr/include
  )
  
  FIND_LIBRARY(FFMPEG_avformat_LIBRARY avformat
--- 12,53 ----
  # if needed to FFMPEG_LIBRARIES if ffmpeg ever changes...
  
! FIND_PATH(FFMPEG_INCLUDE_DIR avformat.h
!        PATHS
!        $ENV{FFMPEG_DIR}/include
!        $ENV{OSGDIR}/include
!        $ENV{OSG_ROOT}/include
!        ~/Library/Frameworks
!        /Library/Frameworks
         /usr/local/include
         /usr/include
+        /sw/include # Fink
+        /opt/local/include # DarwinPorts
+        /opt/csw/include # Blastwave
+        /opt/include
+        /usr/freeware/include
+        PATH_SUFFIXES ffmpeg
+        DOC "Location of FFMPEG Headers"
+ )
+ 
+ IF( NOT FFMPEG_INCLUDE_DIR )
+   FIND_PATH(FFMPEG_INCLUDE_DIR libavformat/avformat.h
+        PATHS
+        $ENV{FFMPEG_DIR}/include
+        $ENV{OSGDIR}/include
+        $ENV{OSG_ROOT}/include
+        ~/Library/Frameworks
+        /Library/Frameworks
+        /usr/local/include
+        /usr/include
+        /sw/include # Fink
+        /opt/local/include # DarwinPorts
+        /opt/csw/include # Blastwave
+        /opt/include
+        /usr/freeware/include
+        PATH_SUFFIXES ffmpeg
+        DOC "Location of FFMPEG Headers"
  )
+ ENDIF( NOT FFMPEG_INCLUDE_DIR )
+ 
  
  FIND_LIBRARY(FFMPEG_avformat_LIBRARY avformat