[med-svn] r10711 - trunk/packages/vxl/trunk/debian/patches

[Mathieu Malaterre]

Author: malat
Date: 2012-05-05 19:41:04 +0000 (Sat, 05 May 2012)
New Revision: 10711

Modified:
   trunk/packages/vxl/trunk/debian/patches/ffmpeg_C99.patch
Log:
Fix issue on kfreebsd

Modified: trunk/packages/vxl/trunk/debian/patches/ffmpeg_C99.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/ffmpeg_C99.patch	2012-05-05 17:58:28 UTC (rev 10710)
+++ trunk/packages/vxl/trunk/debian/patches/ffmpeg_C99.patch	2012-05-05 19:41:04 UTC (rev 10711)
@@ -6,8 +6,8 @@
 
 Index: vxl-1.14.0/core/vidl/vidl_ffmpeg_convert.h
 ===================================================================
---- vxl-1.14.0.orig/core/vidl/vidl_ffmpeg_convert.h	2011-12-20 11:06:19.000000000 +0100
-+++ vxl-1.14.0/core/vidl/vidl_ffmpeg_convert.h	2011-12-20 11:18:39.000000000 +0100
+--- vxl-1.14.0.orig/core/vidl/vidl_ffmpeg_convert.h	2012-05-05 21:35:57.200911870 +0200
++++ vxl-1.14.0/core/vidl/vidl_ffmpeg_convert.h	2012-05-05 21:36:06.496911537 +0200
 @@ -18,6 +18,9 @@
  #include <vidl/vidl_config.h>
  extern "C" {
@@ -18,3 +18,12 @@
  #include <libavcodec/avcodec.h>
  #else
  #include <ffmpeg/avcodec.h>
+Index: vxl-1.14.0/core/vidl/tests/test_include.cxx
+===================================================================
+--- vxl-1.14.0.orig/core/vidl/tests/test_include.cxx	2012-05-05 21:36:16.528911175 +0200
++++ vxl-1.14.0/core/vidl/tests/test_include.cxx	2012-05-05 21:36:21.596910990 +0200
+@@ -1,3 +1,4 @@
++#define __STDC_CONSTANT_MACROS
+ #include <vidl/vidl_config.h> // needed for VIDL_HAS_FFMPEG etc.
+ #include <vidl/vidl_v4l2_pixel_format.h>
+ #include <vidl/vidl_color.h>