merged revisions r7802,r7804,r7805 from 2.4 branch

2012-04-03 00:33:33 +00:00
parent 56b5e6d8a8
commit 9bfd50e6ae
5 changed files with 207 additions and 6 deletions
--- a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
@@ -54,6 +54,8 @@ extern "C" {

 #include "ffmpeg_codecs.hpp"

+#include <libavutil/mathematics.h>
+
 #ifdef WIN32
  #define HAVE_FFMPEG_SWSCALE 1
  #include <libavcodec/avcodec.h>