Commit 68bdac5d authored by Dave Partyka's avatar Dave Partyka
Browse files

COMP: further fixes for FFMPEGWriter after consulting Berk.

parent bc623376
......@@ -26,13 +26,13 @@ FIND_PATH(FFMPEG_INCLUDE_DIR avformat.h
/opt/csw/include # Blastwave
/opt/include
/usr/freeware/include
PATH_SUFFIXES ffmpeg
# PATH_SUFFIXES ffmpeg
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 avformat.h
FIND_PATH(FFMPEG_INCLUDE_DIR libavformat/avformat.h
PATHS
$ENV{FFMPEG_DIR}/include
$ENV{OSGDIR}/include
......@@ -46,7 +46,7 @@ IF( NOT FFMPEG_INCLUDE_DIR )
/opt/csw/include # Blastwave
/opt/include
/usr/freeware/include
PATH_SUFFIXES libavformat
PATH_SUFFIXES ffmpeg
DOC "Location of FFMPEG Headers"
)
ENDIF( NOT FFMPEG_INCLUDE_DIR )
......
......@@ -21,13 +21,19 @@
#include "vtkFFMPEGConfig.h"
extern "C" {
#include <avformat.h>
#ifdef VTK_FFMPEG_HAS_OLD_HEADER
# include <ffmpeg/avformat.h>
#else
# include <libavformat/avformat.h>
#endif
#ifndef VTK_FFMPEG_HAS_IMG_CONVERT
# include <swscale.h>
# ifdef VTK_FFMPEG_HAS_OLD_HEADER
# include <ffmpeg/swscale.h>
# else
# include <libswscale/swscale.h>
# endif
#endif
}
//---------------------------------------------------------------------------
......@@ -398,7 +404,7 @@ void vtkFFMPEGWriterInternal::End()
//---------------------------------------------------------------------------
vtkStandardNewMacro(vtkFFMPEGWriter);
vtkCxxRevisionMacro(vtkFFMPEGWriter, "1.10");
vtkCxxRevisionMacro(vtkFFMPEGWriter, "1.11");
//---------------------------------------------------------------------------
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