diff options
| author | Diego Biurrun <diego@biurrun.de> | 2015-03-29 14:44:23 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2015-03-30 17:49:05 +0200 |
| commit | 23944d29a22a2cd602753b3705f73011c3bf0b18 (patch) | |
| tree | d176951f06dccc0f97a400e4ecc8186fdc3f1bc2 /libavcodec | |
| parent | 7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161 (diff) | |
| download | ffmpeg-23944d29a22a2cd602753b3705f73011c3bf0b18.tar.gz | |
indeo: Give Indeo4/5 shared code a more consistent name
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/indeo4.c | 2 | ||||
| -rw-r--r-- | libavcodec/indeo4data.h | 3 | ||||
| -rw-r--r-- | libavcodec/indeo5.c | 2 | ||||
| -rw-r--r-- | libavcodec/ivi.c (renamed from libavcodec/ivi_common.c) | 2 | ||||
| -rw-r--r-- | libavcodec/ivi.h (renamed from libavcodec/ivi_common.h) | 6 | ||||
| -rw-r--r-- | libavcodec/ivi_dsp.c | 2 | ||||
| -rw-r--r-- | libavcodec/ivi_dsp.h | 5 |
8 files changed, 13 insertions, 13 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 39158f3ea2..f5b23bbc58 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -240,8 +240,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 35f266ee13..92f3062c19 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 8311c68816..be7c41356b 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 5a112f95b7..2d00c23604 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 7c4d53ecec..ce1e5aae28 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 e2cc593b61..5dadd9f4a5 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 ecc49b39bc..7d1278431b 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 11c2f5cfec..45c8a18086 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 |