[Jahshaka-cvs] SF.net SVN: openlibraries:[1430] trunk

[<tim...@us...>]

Revision: 1430
          http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1430&view=rev
Author:   timdewhirst
Date:     2008-10-29 12:38:37 +0000 (Wed, 29 Oct 2008)

Log Message:
-----------
olibs
 * modification to FindFFMPEG to work on linux
 * modification to avformat to comply with latest ffmpeg
 

Modified Paths:
--------------
    trunk/FindFFMPEG.cmake
    trunk/src/openmedialib/plugins/avformat/CMakeLists.txt
    trunk/src/openmedialib/plugins/avformat/avformat_plugin.cpp

Modified: trunk/FindFFMPEG.cmake
===================================================================
--- trunk/FindFFMPEG.cmake	2008-10-22 14:53:37 UTC (rev 1429)
+++ trunk/FindFFMPEG.cmake	2008-10-29 12:38:37 UTC (rev 1430)
@@ -15,7 +15,7 @@
    SET( FFMPEG_LIBRARY_DIR $ENV{FFMPEGDIR}/lib )
    SET( FFMPEG_INCLUDE_PATHS $ENV{FFMPEGDIR}/include )
 else( WIN32 )
-   SET( FFMPEG_LIBRARIES avformat.so.52 avcodec.so.51 avutil.so.49 avdevice.so.52 swscale.so.0 )
+   SET( FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale )
    INCLUDE(FindPkgConfig)
    if ( PKG_CONFIG_FOUND )
       pkg_check_modules( AVFORMAT libavformat )
@@ -56,6 +56,22 @@
    SET( TMP_ TMP-NOTFOUND )
 ENDFOREACH( INC_ )
 
+# clear out duplicates
+LIST( REMOVE_DUPLICATES FFMPEG_INCLUDE_DIR )
+LIST( REMOVE_DUPLICATES FFMPEG_LIBRARY_DIR )
+
+# find the full paths of the libraries
+IF ( NOT WIN32 )
+   FOREACH( LIB_ ${FFMPEG_LIBRARIES} )
+      FIND_LIBRARY( TMP_ NAMES ${LIB_} PATHS ${FFMPEG_LIBRARY_DIR} )
+      IF ( TMP_ )
+	 SET( FFMPEG_LIBRARIES_FULL ${FFMPEG_LIBRARIES_FULL} ${TMP_} )
+      ENDIF ( TMP_ )
+      SET( TMP_ TMP-NOTFOUND )
+   ENDFOREACH( LIB_ )
+   SET ( FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES_FULL} )
+ENDIF( NOT WIN32 )
+
 LIST( LENGTH FFMPEG_HEADERS LIST_SIZE_ )
 
 SET( FFMPEG_FOUND FALSE )

Modified: trunk/src/openmedialib/plugins/avformat/CMakeLists.txt
===================================================================
--- trunk/src/openmedialib/plugins/avformat/CMakeLists.txt	2008-10-22 14:53:37 UTC (rev 1429)
+++ trunk/src/openmedialib/plugins/avformat/CMakeLists.txt	2008-10-29 12:38:37 UTC (rev 1430)
@@ -1,7 +1,9 @@
 
 find_package( FFMPEG REQUIRED )
 if( FFMPEG_FOUND )
-   message( "found FFMPEG: ${FFMPEG_INCLUDE_DIR} ${FFMPEG_LIBRARY_DIR}" )
+   message( "found FFMPEG:" ) 
+   message( "include: ${FFMPEG_INCLUDE_DIR}" )
+   message( "library: ${FFMPEG_LIBRARY_DIR}" )
    include_directories( ${FFMPEG_INCLUDE_DIR} )
    include_directories( ${OpenLibraries_SOURCE_DIR}/src )
 

Modified: trunk/src/openmedialib/plugins/avformat/avformat_plugin.cpp
===================================================================
--- trunk/src/openmedialib/plugins/avformat/avformat_plugin.cpp	2008-10-22 14:53:37 UTC (rev 1429)
+++ trunk/src/openmedialib/plugins/avformat/avformat_plugin.cpp	2008-10-29 12:38:37 UTC (rev 1430)
@@ -33,8 +33,8 @@
 
 
 extern "C" {
-#include <avformat.h>
-#include <swscale.h>
+#include <libavformat/avformat.h>
+#include <libswscale/swscale.h>
 }
 
 namespace oml = olib::openmedialib;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.