Merge commit '23944d29a22a2cd602753b3705f73011c3bf0b18'

* commit '23944d29a22a2cd602753b3705f73011c3bf0b18':
  indeo: Give Indeo4/5 shared code a more consistent name

Merged-by: Michael Niedermayer <michaelni@gmx.at>

8 files changed, 13 insertions, 13 deletions

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index e73005d816..6e6285a934 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -287,8 +287,8 @@ OBJS-$(CONFIG_IFF_ILBM_DECODER)        += iff.o
 OBJS-$(CONFIG_IMC_DECODER)             += imc.o
 OBJS-$(CONFIG_INDEO2_DECODER)          += indeo2.o
 OBJS-$(CONFIG_INDEO3_DECODER)          += indeo3.o
-OBJS-$(CONFIG_INDEO4_DECODER)          += indeo4.o ivi_common.o ivi_dsp.o
-OBJS-$(CONFIG_INDEO5_DECODER)          += indeo5.o ivi_common.o ivi_dsp.o
+OBJS-$(CONFIG_INDEO4_DECODER)          += indeo4.o ivi.o ivi_dsp.o
+OBJS-$(CONFIG_INDEO5_DECODER)          += indeo5.o ivi.o ivi_dsp.o
 OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER)  += dpcm.o
 OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o
 OBJS-$(CONFIG_JACOSUB_DECODER)         += jacosubdec.o ass.o
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index ed4272bbe6..31088f9e0c 100644
--- 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
diff --git a/libavcodec/indeo4data.h b/libavcodec/indeo4data.h
index efc5a6597e..cc497c2391 100644
--- a/libavcodec/indeo4data.h
+++ b/libavcodec/indeo4data.h
@@ -29,8 +29,7 @@
 
 #include <stdint.h>
 
-#include "ivi_common.h"
-#include "mathops.h"
+#include "ivi.h"
 
 /**
  *  standard picture dimensions
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c
index 71a54d59ec..7474863334 100644
--- a/libavcodec/indeo5.c
+++ b/libavcodec/indeo5.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 "indeo5data.h"
 
 /**
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi.c
index d27eff2c3e..c4d2aa1657 100644
--- a/libavcodec/ivi_common.c
+++ b/libavcodec/ivi.c
@@ -35,7 +35,7 @@
 #include "get_bits.h"
 #include "internal.h"
 #include "mathops.h"
-#include "ivi_common.h"
+#include "ivi.h"
 #include "ivi_dsp.h"
 
 /**
diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi.h
index 9fec960e0b..abe43462a1 100644
--- a/libavcodec/ivi_common.h
+++ b/libavcodec/ivi.h
@@ -26,8 +26,8 @@
  * Indeo5 decoders.
  */
 
-#ifndef AVCODEC_IVI_COMMON_H
-#define AVCODEC_IVI_COMMON_H
+#ifndef AVCODEC_IVI_H
+#define AVCODEC_IVI_H
 
 #include "avcodec.h"
 #include "get_bits.h"
@@ -342,4 +342,4 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
                         AVPacket *avpkt);
 int ff_ivi_decode_close(AVCodecContext *avctx);
 
-#endif /* AVCODEC_IVI_COMMON_H */
+#endif /* AVCODEC_IVI_H */
diff --git a/libavcodec/ivi_dsp.c b/libavcodec/ivi_dsp.c
index 89121ac080..4b973992e0 100644
--- a/libavcodec/ivi_dsp.c
+++ b/libavcodec/ivi_dsp.c
@@ -27,7 +27,7 @@
  */
 
 #include "avcodec.h"
-#include "ivi_common.h"
+#include "ivi.h"
 #include "ivi_dsp.h"
 
 void ff_ivi_recompose53(const IVIPlaneDesc *plane, uint8_t *dst,
diff --git a/libavcodec/ivi_dsp.h b/libavcodec/ivi_dsp.h
index 15562b6e37..f64c718e72 100644
--- a/libavcodec/ivi_dsp.h
+++ b/libavcodec/ivi_dsp.h
@@ -29,8 +29,9 @@
 #ifndef AVCODEC_IVI_DSP_H
 #define AVCODEC_IVI_DSP_H
 
-#include "avcodec.h"
-#include "ivi_common.h"
+#include <stdint.h>
+
+#include "ivi.h"
 
 /**
  *  5/3 wavelet recomposition filter for Indeo5