Removed unused NEW_FFMPEG macro.

eb8d9730 · Roman Donchenko · e2ef2a57 · eb8d9730 · eb8d9730
Commit eb8d9730 authored Jul 11, 2013 by Roman Donchenko
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

ffmpeg_version.cmake 3rdparty/ffmpeg/ffmpeg_version.cmake +0 -1

cvconfig.h.cmake cmake/templates/cvconfig.h.cmake +0 -3

No files found.
--- a/3rdparty/ffmpeg/ffmpeg_version.cmake
+++ b/3rdparty/ffmpeg/ffmpeg_version.cmake
-set(NEW_FFMPEG 1)
 set(HAVE_FFMPEG_CODEC 1)
 set(HAVE_FFMPEG_FORMAT 1)
 set(HAVE_FFMPEG_UTIL 1)

--- 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