Show
Ignore:
Timestamp:
03/03/09 17:36:31 (5 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:
2 modified

Legend:

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

    • Property svn:mergeinfo set to /OpenSceneGraph/trunk:9838-9843
  • 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: