r730 - in /experimental/ffmpeg/debian: changelog patches/300_c++_compliant_headers.diff patches/series

[sho at users.alioth.debian.org]

Author: sho
Date: Thu Mar 29 20:26:50 2007
New Revision: 730

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=730
Log:
  * debian/patches/300_c++_compliant_headers.diff:
    + Define INT64_C() when the system headers don't provide it, for instance
      when building C++ code.

Added:
    experimental/ffmpeg/debian/patches/300_c++_compliant_headers.diff
Modified:
    experimental/ffmpeg/debian/changelog
    experimental/ffmpeg/debian/patches/series

Modified: experimental/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/changelog?rev=730&op=diff
==============================================================================
--- experimental/ffmpeg/debian/changelog (original)
+++ experimental/ffmpeg/debian/changelog Thu Mar 29 20:26:50 2007
@@ -10,6 +10,10 @@
   * debian/patches/054_h264_mmx_chroma_mc_crash.diff:
     + New patch: workaround for a buffer overflow in the MMX H264 chroma
       motion compensation until upstream fixes it properly (Closes: #404176).
+
+  * debian/patches/300_c++_compliant_headers.diff:
+    + Define INT64_C() when the system headers don't provide it, for instance
+      when building C++ code.
 
   * debian/control:
     + Set pkg-multimedia-maintainers as main maintainer.

Added: experimental/ffmpeg/debian/patches/300_c++_compliant_headers.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/300_c%2B%2B_compliant_headers.diff?rev=730&op=file
==============================================================================
--- experimental/ffmpeg/debian/patches/300_c++_compliant_headers.diff (added)
+++ experimental/ffmpeg/debian/patches/300_c++_compliant_headers.diff Thu Mar 29 20:26:50 2007
@@ -1,0 +1,19 @@
+Index: ffmpeg-0.cvs20070307/libavcodec/avcodec.h
+===================================================================
+--- ffmpeg-0.cvs20070307.orig/libavcodec/avcodec.h	2007-03-29 22:22:06.000000000 +0200
++++ ffmpeg-0.cvs20070307/libavcodec/avcodec.h	2007-03-29 22:23:03.000000000 +0200
+@@ -34,6 +34,14 @@
+ #include "avutil.h"
+ #include <sys/types.h> /* size_t */
+ 
++#if !defined INT64_C
++#if defined __WORDSIZE && __WORDSIZE == 64
++#define INT64_C(c) c ## L
++#else
++#define INT64_C(c) c ## LL
++#endif
++#endif
++
+ #define AV_STRINGIFY(s)         AV_TOSTRING(s)
+ #define AV_TOSTRING(s) #s
+ 

Modified: experimental/ffmpeg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/series?rev=730&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/series (original)
+++ experimental/ffmpeg/debian/patches/series Thu Mar 29 20:26:50 2007
@@ -17,3 +17,4 @@
 053_rm_demux_crash.diff
 054_h264_mmx_chroma_mc_crash.diff
 060_fix_avi_skip.diff
+300_c++_compliant_headers.diff