Merge remote-tracking branch 'qatar/master'

* qatar/master: cpu: Include common.h for av_popcount64 Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · fe99b1d50e
parent 4059c7836a 597208fde1
commit fe99b1d50e
1 changed files with 1 additions and 0 deletions
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@ -19,6 +19,7 @@
 #include "cpu.h"
 #include "config.h"
 #include "opt.h"
+#include "common.h"

 #if HAVE_SCHED_GETAFFINITY
 #ifndef _GNU_SOURCE