summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-13 23:41:12 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-13 23:41:17 +0100
commitd61e1156beae2f33aceb7c12010c1475d3e597d5 (patch)
tree5d31229e5fd388b5d8a4685db77b7d8b1047884f /libavcodec
parente52d97a7aceb90e4b4de52e3f6ef2718e8cd9d61 (diff)
parent17608f6ee3d2088cdb8d1e704276d8b34f01160d (diff)
downloadffmpeg-streaming-d61e1156beae2f33aceb7c12010c1475d3e597d5.zip
ffmpeg-streaming-d61e1156beae2f33aceb7c12010c1475d3e597d5.tar.gz
Merge commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d'
* commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d': x86: Add some more missing headers Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/x86/dsputil_init.c1
-rw-r--r--libavcodec/x86/dsputil_x86.h1
-rw-r--r--libavcodec/x86/hpeldsp_init.c1
-rw-r--r--libavcodec/x86/simple_idct.c1
4 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c
index e0b4041..2fc5495 100644
--- a/libavcodec/x86/dsputil_init.c
+++ b/libavcodec/x86/dsputil_init.c
@@ -25,6 +25,7 @@
#include "libavutil/internal.h"
#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
+#include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/simple_idct.h"
#include "libavcodec/version.h"
diff --git a/libavcodec/x86/dsputil_x86.h b/libavcodec/x86/dsputil_x86.h
index 4f7ac90..ee23b65 100644
--- a/libavcodec/x86/dsputil_x86.h
+++ b/libavcodec/x86/dsputil_x86.h
@@ -25,6 +25,7 @@
#include <stddef.h>
#include <stdint.h>
+#include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
#include "libavutil/x86/asm.h"
#include "constants.h"
diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c
index 385f01b..e04a035 100644
--- a/libavcodec/x86/hpeldsp_init.c
+++ b/libavcodec/x86/hpeldsp_init.c
@@ -26,6 +26,7 @@
#include "libavutil/cpu.h"
#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
+#include "libavcodec/avcodec.h"
#include "libavcodec/hpeldsp.h"
#include "dsputil_x86.h"
diff --git a/libavcodec/x86/simple_idct.c b/libavcodec/x86/simple_idct.c
index c666b1a..e10dc7b 100644
--- a/libavcodec/x86/simple_idct.c
+++ b/libavcodec/x86/simple_idct.c
@@ -21,6 +21,7 @@
*/
#include "libavcodec/simple_idct.h"
#include "libavutil/mem.h"
+#include "libavutil/x86/asm.h"
#include "dsputil_x86.h"
#if HAVE_INLINE_ASM
OpenPOWER on IntegriCloud