Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 09:51:18 +0000 (11:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 09:51:38 +0000 (11:51 +0200)
* qatar/master:
  avutil: Fix compilation with inline asm disabled on mingw

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/x86/timer.h

Simple merge