merged all the latest changes from 2.4 to trunk

2012-04-13 21:50:59 +00:00
parent 020f9a6047
commit 2fd1e2ea57
416 changed files with 12852 additions and 6070 deletions
--- a/cmake/templates/cvconfig.h.cmake
+++ b/cmake/templates/cvconfig.h.cmake
@@ -40,6 +40,9 @@
 /* FFMpeg video library */
 #cmakedefine  HAVE_FFMPEG

+/* FFMpeg version flag */
+#cmakedefine  NEW_FFMPEG
+
 /* ffmpeg's libswscale */
 #cmakedefine  HAVE_FFMPEG_SWSCALE