diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 21:29:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 21:30:25 +0200 |
| commit | 2dbda9378c1e60d9f8b11ca0d1b3113a01e39742 (patch) | |
| tree | b6a74e7e2c38d01a4a4e7cecd1464ecf0bb6a8ae | |
| parent | 0f7013108998938531c38eb9414e9c818078dcdd (diff) | |
| parent | cb44b21da1f59923be577f08c267ec270529be97 (diff) | |
Merge commit 'cb44b21da1f59923be577f08c267ec270529be97'
* commit 'cb44b21da1f59923be577f08c267ec270529be97':
dct-test: Move cpu_flags variable out of global scope
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dct-test.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index f7c47fbb5e..8c72a95202 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 }, @@ -538,8 +536,6 @@ int main(int argc, char **argv) int err = 0; int bits=8; - cpu_flags = av_get_cpu_flags(); - ff_ref_dct_init(); idct_mmx_init(); @@ -573,6 +569,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)) { |