Merge commit 'cb44b21da1f59923be577f08c267ec270529be97'

* commit 'cb44b21da1f59923be577f08c267ec270529be97':
  dct-test: Move cpu_flags variable out of global scope

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/dct-test.c
index f7c47fbb5eb98bf144a898684feb0ba0eee526e0,4e670241b5010e319d5efaca9f8c07251c4dad8b..8c72a952021e4e53055f8a271fc71c36af0f6d06
--- 1/libavcodec/dct-test.c
--- 2/libavcodec/dct-test.c
+++ b/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();