summaryrefslogtreecommitdiff
path: root/libavcodec/x86/h264_qpel.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-12 21:55:24 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-12 21:55:40 +0200
commit63b0356274bc496c486cbedcb563302c36996024 (patch)
tree81419036f6b3f3736fd712305227ad4bd6ec571d /libavcodec/x86/h264_qpel.c
parentb68b5ec5136da66088b5a8f772c3775b79196eb4 (diff)
parentb7a4127a45b780d76e6b09427a3d0197c4bc1cdb (diff)
Merge commit 'b7a4127a45b780d76e6b09427a3d0197c4bc1cdb'
* commit 'b7a4127a45b780d76e6b09427a3d0197c4bc1cdb': h264_qpel: Use the correct header Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_qpel.c')
-rw-r--r--libavcodec/x86/h264_qpel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c
index 33a7fb03ba..d9cb5f264c 100644
--- a/libavcodec/x86/h264_qpel.c
+++ b/libavcodec/x86/h264_qpel.c
@@ -23,8 +23,8 @@
#include "libavutil/cpu.h"
#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
+#include "libavcodec/h264.h"
#include "libavcodec/h264qpel.h"
-#include "libavcodec/mpegvideo.h"
#include "libavcodec/pixels.h"
#include "fpel.h"