Merge commit 'cb44b21da1f59923be577f08c267ec270529be97'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 19:29:38 +0000 (21:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 19:30:25 +0000 (21:30 +0200)
* commit 'cb44b21da1f59923be577f08c267ec270529be97':
  dct-test: Move cpu_flags variable out of global scope

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dct-test.c

@@@ -536,10 -467,7 +534,8 @@@ int main(int argc, char **argv
      int test = 1;
      int speed = 0;
      int err = 0;
 +    int bits=8;
  
-     cpu_flags = av_get_cpu_flags();
      ff_ref_dct_init();
      idct_mmx_init();