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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-12-20 10:18:34 +0000 (Tue, 20 Dec 2011)
New Revision: 9058

Modified:
   trunk/packages/vxl/trunk/debian/patches/ffmpeg_C99.patch
   trunk/packages/vxl/trunk/debian/patches/series
Log:
missing patch

Modified: trunk/packages/vxl/trunk/debian/patches/ffmpeg_C99.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/ffmpeg_C99.patch	2011-12-20 10:11:58 UTC (rev 9057)
+++ trunk/packages/vxl/trunk/debian/patches/ffmpeg_C99.patch	2011-12-20 10:18:34 UTC (rev 9058)
@@ -1,18 +1,13 @@
-Description: ffmpeg needs C99 #define
-Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Last-Update: 2011-07-24
-
-Index: vxl-1.14.0/core/vidl/vidl_ffmpeg_convert.h
-===================================================================
---- vxl-1.14.0.orig/core/vidl/vidl_ffmpeg_convert.h	2011-04-13 17:38:24.000000000 +0200
-+++ vxl-1.14.0/core/vidl/vidl_ffmpeg_convert.h	2011-04-13 17:38:37.000000000 +0200
-@@ -12,6 +12,9 @@
- // \date 19 Jan 2006
- //
- 
-+#define __STDC_CONSTANT_MACROS
-+#include <stdint.h>
-+
- #include "vidl_frame_sptr.h"
- #include "vidl_pixel_format.h"
- 
+http://vxl.svn.sf.net/viewvc/vxl?view=revision&revision=31498
+--- trunk/core/vidl/vidl_ffmpeg_convert.h	2011/03/21 19:45:16	31497
++++ trunk/core/vidl/vidl_ffmpeg_convert.h	2011/03/21 20:29:38	31498
+@@ -18,6 +18,9 @@
+ #include <vidl/vidl_config.h>
+ extern "C" {
+ #if FFMPEG_IN_SEVERAL_DIRECTORIES
++#ifndef __STDC_CONSTANT_MACROS
++#  define __STDC_CONSTANT_MACROS
++#endif
+ #include <libavcodec/avcodec.h>
+ #else
+ #include <ffmpeg/avcodec.h>

Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series	2011-12-20 10:11:58 UTC (rev 9057)
+++ trunk/packages/vxl/trunk/debian/patches/series	2011-12-20 10:18:34 UTC (rev 9058)
@@ -7,3 +7,4 @@
 fix_alphacomp.patch
 install_doxygen.patch
 libav_trunk.patch
+ffmpeg_C99.patch