Commit c2a58da8 authored by Dave Partyka's avatar Dave Partyka
Browse files

COMP: attempt to fix ffmpeg writer on dash17.

parent 24cb0aa7
......@@ -11,6 +11,7 @@
# This is usefull to do it this way so that we can always add more libraries
# if needed to FFMPEG_LIBRARIES if ffmpeg ever changes...
# if ffmpeg headers are all in one directory
FIND_PATH(FFMPEG_INCLUDE_DIR avformat.h
PATHS
$ENV{FFMPEG_DIR}/include
......@@ -29,8 +30,9 @@ FIND_PATH(FFMPEG_INCLUDE_DIR avformat.h
DOC "Location of FFMPEG Headers"
)
# if ffmpeg headers are seperated to each of libavformat, libavcodec etc..
IF( NOT FFMPEG_INCLUDE_DIR )
FIND_PATH(FFMPEG_INCLUDE_DIR libavformat/avformat.h
FIND_PATH(FFMPEG_INCLUDE_DIR avformat.h
PATHS
$ENV{FFMPEG_DIR}/include
$ENV{OSGDIR}/include
......@@ -44,7 +46,7 @@ IF( NOT FFMPEG_INCLUDE_DIR )
/opt/csw/include # Blastwave
/opt/include
/usr/freeware/include
PATH_SUFFIXES ffmpeg
PATH_SUFFIXES libavformat
DOC "Location of FFMPEG Headers"
)
ENDIF( NOT FFMPEG_INCLUDE_DIR )
......
......@@ -21,11 +21,13 @@
#include "vtkFFMPEGConfig.h"
extern "C" {
#ifdef VTK_FFMPEG_HAS_OLD_HEADER
# include <ffmpeg/avformat.h>
#else
# include <libavformat/avformat.h>
#endif
//#ifdef VTK_FFMPEG_HAS_OLD_HEADER
//# include <ffmpeg/avformat.h>
//#else
//# include <libavformat/avformat.h>
//#endif
#include <avformat.h>
#ifndef VTK_FFMPEG_HAS_IMG_CONVERT
# include <libswscale/swscale.h>
......@@ -400,7 +402,7 @@ void vtkFFMPEGWriterInternal::End()
//---------------------------------------------------------------------------
vtkStandardNewMacro(vtkFFMPEGWriter);
vtkCxxRevisionMacro(vtkFFMPEGWriter, "1.7");
vtkCxxRevisionMacro(vtkFFMPEGWriter, "1.8");
//---------------------------------------------------------------------------
vtkFFMPEGWriter::vtkFFMPEGWriter()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment