[SCM] libav/experimental: dct-test: Move cpu_flags variable out of global scope
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:03:53 UTC 2014
The following commit has been merged in the experimental branch:
commit cb44b21da1f59923be577f08c267ec270529be97
Author: Diego Biurrun <diego at biurrun.de>
Date: Tue Feb 18 11:57:48 2014 +0100
dct-test: Move cpu_flags variable out of global scope
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index d0177f5..4e67024 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -66,8 +66,6 @@ struct algo {
int nonspec;
};
-static int cpu_flags;
-
static const struct algo fdct_tab[] = {
{ "REF-DBL", ff_ref_fdct, NO_PERM },
{ "FAAN", ff_faandct, NO_PERM },
@@ -470,8 +468,6 @@ int main(int argc, char **argv)
int speed = 0;
int err = 0;
- cpu_flags = av_get_cpu_flags();
-
ff_ref_dct_init();
idct_mmx_init();
@@ -504,6 +500,7 @@ int main(int argc, char **argv)
if (test_248_dct) {
idct248_error("SIMPLE-C", ff_simple_idct248_put, speed);
} else {
+ const int cpu_flags = av_get_cpu_flags();
const struct algo *algos = test_idct ? idct_tab : fdct_tab;
for (i = 0; algos[i].name; i++)
if (!(~cpu_flags & algos[i].mm_support)) {
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list