mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2025-03-02 00:56:00 +00:00
Merge commit 'cb44b21da1f59923be577f08c267ec270529be97'
* commit 'cb44b21da1f59923be577f08c267ec270529be97': dct-test: Move cpu_flags variable out of global scope Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
2dbda9378c
@ -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)) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user