Changeset 9818

Show
Ignore:
Timestamp:
02/25/09 21:52:34 (6 years ago)
Author:
robert
Message:

Tweaks to handle more modern version of ffmpeg compiled form source.

Location:
OpenSceneGraph/trunk/src/osgPlugins/ffmpeg
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/CMakeLists.txt

    r9816 r9818  
    1 INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} ) 
     1# INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} ) 
     2 
     3INCLUDE_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 
     8) 
     9 
     10MESSAGE("FFMPEG_INCLUDE_DIRS = "  ${FFMPEG_INCLUDE_DIRS} ) 
     11MESSAGE("FFMPEG_LIBRARIES = "  ${FFMPEG_LIBRARIES} ) 
    212 
    313SET(TARGET_SRC  
  • OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp

    r9816 r9818  
    1  
    21#include "FFmpegDecoderAudio.hpp" 
    32 
    43#include <osg/Notify> 
    5  
    64 
    75#include <stdexcept> 
  • OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp

    r9816 r9818  
    55#include <OpenThreads/Thread> 
    66 
    7 #include "AudioSinkInterface.hpp" 
    8 #include "BoundedMessageQueue.hpp" 
    97#include "FFmpegClocks.hpp" 
    108#include "FFmpegPacket.hpp" 
    119#include "FFmpegSampleFormat.hpp" 
     10 
     11#include "AudioSinkInterface.hpp" 
     12#include "BoundedMessageQueue.hpp" 
    1213 
    1314 
  • OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp

    r9816 r9818  
    1  
    21#include "FFmpegDecoderVideo.hpp" 
    32 
  • OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp

    r9816 r9818  
    33#define HEADER_GUARD_OSGFFMPEG_FFMPEG_DECODER_VIDEO_H 
    44 
    5 #include <boost/shared_ptr.hpp> 
    6 #include <OpenThreads/Thread> 
    7 #include <vector> 
    85 
    96#include "BoundedMessageQueue.hpp" 
     
    118#include "FFmpegPacket.hpp" 
    129 
    13  
     10#include <boost/shared_ptr.hpp> 
     11#include <OpenThreads/Thread> 
     12#include <vector> 
    1413 
    1514namespace osgFFmpeg {