---
libavcodec/Makefile | 4 ++--
libavcodec/indeo4.c | 2 +-
libavcodec/indeo4data.h | 3 +--
libavcodec/indeo5.c | 2 +-
libavcodec/{ivi_common.c => ivi.c} | 2 +-
libavcodec/{ivi_common.h => ivi.h} | 6 +++---
libavcodec/ivi_dsp.c | 2 +-
libavcodec/ivi_dsp.h | 5 +++--
8 files changed, 13 insertions(+), 13 deletions(-)
rename libavcodec/{ivi_common.c => ivi.c} (99%)
rename libavcodec/{ivi_common.h => ivi.h} (99%)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 8a396a7..8dd10c3 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -241,8 +241,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_JPEG2000_DECODER) += jpeg2000dec.o jpeg2000.o
jpeg2000dsp.o \
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index 35f266e..92f3062 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 8311c68..be7c413 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 5a112f9..2d00c23 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
similarity index 99%
rename from libavcodec/ivi_common.c
rename to libavcodec/ivi.c
index 7c4d53e..ce1e5aa 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
similarity index 99%
rename from libavcodec/ivi_common.h
rename to libavcodec/ivi.h
index e2cc593..5dadd9f 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"
@@ -340,4 +340,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 ecc49b3..7d12784 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 11c2f5c..45c8a18 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
--
2.1.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
