diff options
| author | rogerdpack <rogerpack2005@gmail.com> | 2013-01-15 19:09:15 -0700 |
|---|---|---|
| committer | rogerdpack <rogerpack2005@gmail.com> | 2013-01-15 19:09:15 -0700 |
| commit | c540312ac3b58e0bbd751844fc2c47c6e3713cf5 (patch) | |
| tree | fcf92b1c0f1772b379828125c2555a47d1c81c6b /libavfilter/libmpcodecs/pullup.c | |
| parent | 47e88486b4b3b3de992b07f89dfaedf410a8bd5e (diff) | |
| parent | 2b20397e1fbe52db800ef5deb810f7bc2602f248 (diff) | |
| download | ffmpeg-c540312ac3b58e0bbd751844fc2c47c6e3713cf5.tar.gz | |
Merge remote-tracking branch 'origin/master' into combined
Diffstat (limited to 'libavfilter/libmpcodecs/pullup.c')
| -rw-r--r-- | libavfilter/libmpcodecs/pullup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/libmpcodecs/pullup.c b/libavfilter/libmpcodecs/pullup.c index a28b8cfc27..b5fae9ba61 100644 --- a/libavfilter/libmpcodecs/pullup.c +++ b/libavfilter/libmpcodecs/pullup.c @@ -19,9 +19,10 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> + +#include "libavutil/x86/asm.h" #include "config.h" #include "pullup.h" -#include "cpudetect.h" |