diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:53:00 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:53:00 +0200 |
| commit | c142dc203e2590ef0addda30afafb5ce41a13a96 (patch) | |
| tree | 12d6e3148f220ca7e1efdaed62570085d9c8d5f2 /libswscale/x86 | |
| parent | 5e418fd63a29c3189259915d95384b829ddbd21e (diff) | |
| parent | dc40a70c5755bccfb1a1349639943e1f408bea50 (diff) | |
| download | ffmpeg-c142dc203e2590ef0addda30afafb5ce41a13a96.tar.gz | |
Merge commit 'dc40a70c5755bccfb1a1349639943e1f408bea50'
* commit 'dc40a70c5755bccfb1a1349639943e1f408bea50':
Drop unnecessary libavutil/x86/asm.h #includes
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libswscale/x86')
| -rw-r--r-- | libswscale/x86/rgb2rgb.c | 1 | ||||
| -rw-r--r-- | libswscale/x86/swscale.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c index b80e869e0c..ffd12e1609 100644 --- a/libswscale/x86/rgb2rgb.c +++ b/libswscale/x86/rgb2rgb.c @@ -27,7 +27,6 @@ #include "config.h" #include "libavutil/attributes.h" -#include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavutil/cpu.h" #include "libavutil/bswap.h" diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 3b370be662..7356692e50 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -25,7 +25,6 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" -#include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavutil/cpu.h" #include "libavutil/pixdesc.h" |