Commit 63e778d2 authored by Mathieu Malaterre's avatar Mathieu Malaterre
Browse files

ENH: Use the new FindFFMPEG

parent bde407fb
......@@ -195,21 +195,12 @@ ENDIF(DEFINED vtkMPEG2Encode_INCLUDE_PATH)
# If the ffmpeg library is available, compile vtkFFMPEGWriter.
IF (NOT VTK_USE_VIDEO_FOR_WINDOWS)
SET (FFMPEG_INCLUDE_PATH CACHE PATH "Location of the ffmpeg header files avformat.h and avcodec.h")
MARK_AS_ADVANCED (FFMPEG_INCLUDE_PATH)
SET (FFMPEG_LIBRARY_PATH CACHE PATH "Location of the ffmpeg library files ${CMAKE_SHARED_LIBRARY_PREFIX}avformat${CMAKE_SHARED_LIBRARY_SUFFIX} and ${CMAKE_SHARED_LIBRARY_PREFIX}avcodec${CMAKE_SHARED_LIBRARY_SUFFIX}")
MARK_AS_ADVANCED (FFMPEG_LIBRARY_PATH)
IF (FFMPEG_INCLUDE_PATH AND FFMPEG_LIBRARY_PATH)
FIND_PACKAGE(FFMPEG)
IF(FFMPEG_FOUND)
SET(Kit_SRCS ${Kit_SRCS} vtkFFMPEGWriter.cxx)
INCLUDE_DIRECTORIES(${FFMPEG_INCLUDE_PATH})
SET(KIT_LIBS ${KIT_LIBS} ${FFMPEG_LIBRARY_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}avformat${CMAKE_SHARED_LIBRARY_SUFFIX} ${FFMPEG_LIBRARY_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}avcodec${CMAKE_SHARED_LIBRARY_SUFFIX})
SET(VTK_USE_FFMPEG_ENCODER ON CACHE INTERNAL "" FORCE)
ELSE (FFMPEG_INCLUDE_PATH AND FFMPEG_LIBRARY_PATH)
SET(VTK_USE_FFMPEG_ENCODER OFF CACHE INTERNAL "" FORCE)
ENDIF (FFMPEG_INCLUDE_PATH AND FFMPEG_LIBRARY_PATH)
SET(KIT_LIBS ${KIT_LIBS} ${FFMPEG_LIBRARIES})
ENDIF(FFMPEG_FOUND)
ENDIF (NOT VTK_USE_VIDEO_FOR_WINDOWS)
......
......@@ -20,7 +20,7 @@
#include "vtkErrorCode.h"
extern "C" {
#include <avformat.h>
#include <ffmpeg/avformat.h>
}
//---------------------------------------------------------------------------
......@@ -352,7 +352,7 @@ void vtkFFMPEGWriterInternal::End()
//---------------------------------------------------------------------------
vtkStandardNewMacro(vtkFFMPEGWriter);
vtkCxxRevisionMacro(vtkFFMPEGWriter, "1.1");
vtkCxxRevisionMacro(vtkFFMPEGWriter, "1.2");
//---------------------------------------------------------------------------
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