[SCM] libav/experimental: fix for ppc compile broken by (Romain Dolbeau <dolbeau at irisa dot fr> and Colin Leroy <colin at colino dot net>)
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:35:09 UTC 2013
The following commit has been merged in the experimental branch:
commit 475b46dad63cb960b75e9f072064b20bd53571dd
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Feb 1 00:18:50 2003 +0000
fix for ppc compile broken by (Romain Dolbeau <dolbeau at irisa dot fr> and Colin Leroy <colin at colino dot net>)
Originally committed as revision 1526 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/ppc/dsputil_ppc.h b/libavcodec/ppc/dsputil_ppc.h
index 6a96c1d..ef1481a 100644
--- a/libavcodec/ppc/dsputil_ppc.h
+++ b/libavcodec/ppc/dsputil_ppc.h
@@ -75,7 +75,7 @@ extern unsigned long long perfdata_miss[powerpc_perf_total][powerpc_data_total];
#else /* POWERPC_PERF_USE_PMC */
#define POWERPC_GET_CYCLES(a) asm volatile("mfspr %0, 937" : "=r" (a))
#define POWERPC_GET_MISS(a) asm volatile("mfspr %0, 938" : "=r" (a))
-#define POWERPC_TBL_DECLARE(a, cond) register unsigned long cycles_start, cycles_stop, miss_start, miss_stop;
+#define POWERPC_TBL_DECLARE(a, cond) register unsigned long cycles_start, cycles_stop, miss_start, miss_stop
#define POWERPC_TBL_START_COUNT(a, cond) do { POWERPC_GET_MISS(miss_start); POWERPC_GET_CYCLES(cycles_start); } while (0)
#define POWERPC_TBL_STOP_COUNT(a, cond) do { \
POWERPC_GET_CYCLES(cycles_stop); \
@@ -114,9 +114,10 @@ extern unsigned long long perfdata_miss[powerpc_perf_total][powerpc_data_total];
#else /* POWERPC_TBL_PERFORMANCE_REPORT */
-#define POWERPC_TBL_DECLARE(a, cond)
-#define POWERPC_TBL_START_COUNT(a, cond)
-#define POWERPC_TBL_STOP_COUNT(a, cond)
+// those are needed to avoid empty statements.
+#define POWERPC_TBL_DECLARE(a, cond) int altivec_placeholder __attribute__ ((unused))
+#define POWERPC_TBL_START_COUNT(a, cond) do {} while (0)
+#define POWERPC_TBL_STOP_COUNT(a, cond) do {} while (0)
#endif /* POWERPC_TBL_PERFORMANCE_REPORT */
#endif /* _DSPUTIL_PPC_ */
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list