diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 17:14:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 17:19:21 +0200 |
| commit | fe99b1d50ea7bef67fecda10a2b3fa9c1d332814 (patch) | |
| tree | 26dc9ddef75d8110db9088ebcfa22b3ef5e898be /libavutil | |
| parent | 4059c7836a57df95821505dd67322a31ee99f9e8 (diff) | |
| parent | 597208fde175f7ae56f833e8cbae10cb9b709daf (diff) | |
| download | ffmpeg-fe99b1d50ea7bef67fecda10a2b3fa9c1d332814.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cpu: Include common.h for av_popcount64
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/cpu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/cpu.c b/libavutil/cpu.c index 0560ddbaf4..73d58565f3 100644 --- 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 |