From eb8d9730cbd77fea6d91877a942e3c573cf7b5fa Mon Sep 17 00:00:00 2001 From: Roman Donchenko Date: Thu, 11 Jul 2013 12:55:34 +0400 Subject: [PATCH] Removed unused NEW_FFMPEG macro. --- 3rdparty/ffmpeg/ffmpeg_version.cmake | 1 - cmake/templates/cvconfig.h.cmake | 3 --- 2 files changed, 4 deletions(-) diff --git a/3rdparty/ffmpeg/ffmpeg_version.cmake b/3rdparty/ffmpeg/ffmpeg_version.cmake index 3f27077d6..e35e8c7a6 100644 --- a/3rdparty/ffmpeg/ffmpeg_version.cmake +++ b/3rdparty/ffmpeg/ffmpeg_version.cmake @@ -1,4 +1,3 @@ -set(NEW_FFMPEG 1) set(HAVE_FFMPEG_CODEC 1) set(HAVE_FFMPEG_FORMAT 1) set(HAVE_FFMPEG_UTIL 1) diff --git a/cmake/templates/cvconfig.h.cmake b/cmake/templates/cvconfig.h.cmake index 58f96a08f..482707475 100644 --- a/cmake/templates/cvconfig.h.cmake +++ b/cmake/templates/cvconfig.h.cmake @@ -34,9 +34,6 @@ /* FFMpeg video library */ #cmakedefine HAVE_FFMPEG -/* FFMpeg version flag */ -#cmakedefine NEW_FFMPEG - /* ffmpeg's libswscale */ #cmakedefine HAVE_FFMPEG_SWSCALE