summaryrefslogtreecommitdiff
path: root/libavcodec/msmpeg4dec.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-06-26 15:53:00 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2016-06-26 15:53:00 +0200
commitc142dc203e2590ef0addda30afafb5ce41a13a96 (patch)
tree12d6e3148f220ca7e1efdaed62570085d9c8d5f2 /libavcodec/msmpeg4dec.c
parent5e418fd63a29c3189259915d95384b829ddbd21e (diff)
parentdc40a70c5755bccfb1a1349639943e1f408bea50 (diff)
Merge commit 'dc40a70c5755bccfb1a1349639943e1f408bea50'
* commit 'dc40a70c5755bccfb1a1349639943e1f408bea50': Drop unnecessary libavutil/x86/asm.h #includes Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/msmpeg4dec.c')
-rw-r--r--libavcodec/msmpeg4dec.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c
index 35aa15cf68..2f908770e3 100644
--- a/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.c
@@ -28,7 +28,6 @@
#include "mpegvideo.h"
#include "msmpeg4.h"
#include "libavutil/imgutils.h"
-#include "libavutil/x86/asm.h"
#include "h263.h"
#include "mpeg4video.h"
#include "msmpeg4data.h"