Merge commit '050324d020f843ce333276ebb6f27cc6026f37d0'

[ffmpeg] / libavcodec / indeo4.c

diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index ed4272bbe63c0e3e4ec0378d7e2b246bb1aa182e..31088f9e0c9e86179d007c2be2feef56944162b5 100644 (file)
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -30,8 +30,8 @@
 #define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
+#include "ivi.h"
 #include "ivi_dsp.h"
-#include "ivi_common.h"
 #include "indeo4data.h"
 
 #define IVI4_PIC_SIZE_ESC   7