[SCM] FFmpeg packaging branch, master.snapshot, updated. debian/0.6-2-8-gee71676

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.snapshot branch:
commit f982e8071a608d27dcffb00792650259dbaf1d70
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 31 16:15:17 2010 -0400

    Debian specific hack to unbreak c++ applications naively including FFmpeg headers

diff --git a/debian/patches/0004-cpp-hack.patch b/debian/patches/0004-cpp-hack.patch
new file mode 100644
index 0000000..92c28f9
--- /dev/null
+++ b/debian/patches/0004-cpp-hack.patch
@@ -0,0 +1,20 @@
+From: Reinhard Tartler <siretart at tauware.de>
+Subject: [PATCH] unbreak c++ applications naively including FFmpeg headers
+
+UINT64_C and similar aren't standard in C++ unless this macro is
+defined, and ffmpeg headers require it)
+
+--- a/libavutil/avutil.h
++++ b/libavutil/avutil.h
+@@ -78,6 +78,11 @@ enum AVMediaType {
+     AVMEDIA_TYPE_NB
+ };
+ 
++/* Debian specific hack to unbreak c++ applications naively including FFmpeg headers */
++#ifdef __cplusplus
++#define __STDC_CONSTANT_MACROS
++#endif
++
+ #include "common.h"
+ #include "error.h"
+ #include "mathematics.h"
diff --git a/debian/patches/series b/debian/patches/series
index 4db8bde..12f1b01 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Add-VP80-fourcc.patch
 0002-Tweak-doxygen-config.patch
 0003-Backport-AAC-HE-v2.patch
+0004-cpp-hack.patch

-- 
FFmpeg packaging