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_JPEG2000_DECODER) += jpeg2000dec.o jpeg2000.o jpeg2000dsp.o \
#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
#include <stdint.h>
-#include "ivi_common.h"
-#include "mathops.h"
+#include "ivi.h"
/**
* standard picture dimensions
#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"
/**
#include "get_bits.h"
#include "internal.h"
#include "mathops.h"
-#include "ivi_common.h"
+#include "ivi.h"
#include "ivi_dsp.h"
/**
* 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"
AVPacket *avpkt);
int ff_ivi_decode_close(AVCodecContext *avctx);
-#endif /* AVCODEC_IVI_COMMON_H */
+#endif /* AVCODEC_IVI_H */
*/
#include "avcodec.h"
-#include "ivi_common.h"
+#include "ivi.h"
#include "ivi_dsp.h"
void ff_ivi_recompose53(const IVIPlaneDesc *plane, uint8_t *dst,
#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