Show
Ignore:
Timestamp:
03/03/09 17:36:31 (6 years ago)
Author:
shuber
Message:

merging from trunk using

svn merge -r 9837:9843 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk

Location:
OpenSceneGraph/branches/osg-cocoa-dev
Files:
7 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/branches/osg-cocoa-dev

    • Property svn:mergeinfo set to /OpenSceneGraph/trunk:9838-9843
  • OpenSceneGraph/branches/osg-cocoa-dev/CMakeModules/FindFFmpeg.cmake

    r9817 r9846  
    1 # Locate gdal 
     1# Locate ffmpeg 
    22# This module defines 
    33# FFMPEG_LIBRARIES 
    4 # FFMPEG_FOUND, if false, do not try to link to gdal  
     4# FFMPEG_FOUND, if false, do not try to link to ffmpeg  
    55# FFMPEG_INCLUDE_DIR, where to find the headers 
    66# 
     
    1010# Created by Robert Osfield.  
    1111 
    12 #use pkg-config to find various modues 
     12#use pkg-config to find various modes 
    1313INCLUDE(FindPkgConfig OPTIONAL) 
    1414 
     
    3030 
    3131    SET(FFMPEG_INCLUDE_DIRS ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}) 
    32      
     32 
     33    SET(FFMPEG_LIBRARY_DIRS ${FFMPEG_LIBAVFORMAT_LIBRARY_DIRS}) 
     34 
    3335    SET(FFMPEG_LIBRARIES 
    3436        ${FFMPEG_LIBAVFORMAT_LIBRARIES} 
     
    3638        ${FFMPEG_LIBAVCODEC_LIBRARIES} 
    3739        ${FFMPEG_LIBAVUTIL_LIBRARIES}) 
    38      
     40    
    3941ENDIF(FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FOUND) 
    4042 
  • OpenSceneGraph/branches/osg-cocoa-dev/src/OpenThreads/win32

    • Property svn:mergeinfo changed from /OpenSceneGraph/trunk/src/OpenThreads/win32:9832 to /OpenSceneGraph/trunk/src/OpenThreads/win32:9832,9838-9843
  • OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/CMakeLists.txt

    r9827 r9846  
    22 
    33INCLUDE_DIRECTORIES(  
    4     ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/libavformat 
    5     ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/libavdevice 
    6     ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/libavcodec 
    7     ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/libavcodec 
     4    ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/libavformat ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/ffmpeg 
     5    ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/libavdevice ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/ffmpeg 
     6    ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/libavcodec ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/ffmpeg 
     7    ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/libavcodec ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/ffmpeg 
    88) 
    99 
    10 MESSAGE("FFMPEG_INCLUDE_DIRS = "  ${FFMPEG_INCLUDE_DIRS} ) 
    11 MESSAGE("FFMPEG_LIBRARIES = "  ${FFMPEG_LIBRARIES} ) 
     10# MESSAGE("FFMPEG_LIBAVFORMAT_INCLUDE_DIRS = "  ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ) 
     11# MESSAGE("FFMPEG_LIBAVDEVICE_INCLUDE_DIRS = "  ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ) 
     12# MESSAGE("FFMPEG_LIBAVCODEC_INCLUDE_DIRS = "  ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ) 
     13# MESSAGE("FFMPEG_LIBAVUTIL_INCLUDE_DIRS = "  ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ) 
     14# MESSAGE("FFMPEG_LIBRARIES = "  ${FFMPEG_LIBRARIES} ) 
    1215 
    1316SET(TARGET_SRC  
     
    3134) 
    3235 
     36LINK_DIRECTORIES(${FFMPEG_LIBRARY_DIRS}) 
     37 
    3338SET(TARGET_EXTERNAL_LIBRARIES ${FFMPEG_LIBRARIES} ) 
    3439 
    3540 
    3641#### end var setup  ### 
    37 SETUP_PLUGIN(ffmpeg) 
     42SETUP_PLUGIN(ffmpeg ffmpeg) 
  • OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp

    r9826 r9846  
    44 
    55 
     6#include "FFmpegHeaders.hpp" 
    67#include "BoundedMessageQueue.hpp" 
    78#include "FFmpegClocks.hpp" 
  • OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp

    r9827 r9846  
    77#include <OpenThreads/Condition> 
    88#include <OpenThreads/Thread> 
    9  
    10  
    11 #ifdef _WIN32 
    12     #if defined OSG_LIBRARY_STATIC 
    13     #define OSGFFMPEG_EXPORT_API 
    14     #elif defined OSG_LIBRARY || defined osgFFmpeg_EXPORTS 
    15     #define OSGFFMPEG_EXPORT_API  __declspec(dllexport) 
    16     #else 
    17     #define OSGFFMPEG_EXPORT_API  __declspec(dllimport); 
    18     #endif 
    19 #else 
    20     #define OSGFFMPEG_EXPORT_API 
    21 #endif 
    22  
    23  
    249 
    2510namespace osgFFmpeg 
     
    3419 
    3520 
    36     class OSGFFMPEG_EXPORT_API FFmpegImageStream : public osg::ImageStream, public OpenThreads::Thread 
     21    class FFmpegImageStream : public osg::ImageStream, public OpenThreads::Thread 
    3722    { 
    3823    public: 
  • OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp

    r9816 r9846  
    2020        supportsExtension("flv", ""); 
    2121        supportsExtension("mov", ""); 
     22        supportsExtension("ogg", "Theora movie format"); 
    2223        supportsExtension("mpg", "Mpeg movie format"); 
    2324        supportsExtension("mpv", "Mpeg movie format");