Commit 98263d75 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '23944d29'

* commit '23944d29':
  indeo: Give Indeo4/5 shared code a more consistent name
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f5c7531a 23944d29
...@@ -287,8 +287,8 @@ OBJS-$(CONFIG_IFF_ILBM_DECODER) += iff.o ...@@ -287,8 +287,8 @@ OBJS-$(CONFIG_IFF_ILBM_DECODER) += iff.o
OBJS-$(CONFIG_IMC_DECODER) += imc.o OBJS-$(CONFIG_IMC_DECODER) += imc.o
OBJS-$(CONFIG_INDEO2_DECODER) += indeo2.o OBJS-$(CONFIG_INDEO2_DECODER) += indeo2.o
OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.o OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.o
OBJS-$(CONFIG_INDEO4_DECODER) += indeo4.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_common.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_DPCM_DECODER) += dpcm.o
OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o
OBJS-$(CONFIG_JACOSUB_DECODER) += jacosubdec.o ass.o OBJS-$(CONFIG_JACOSUB_DECODER) += jacosubdec.o ass.o
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "ivi.h"
#include "ivi_dsp.h" #include "ivi_dsp.h"
#include "ivi_common.h"
#include "indeo4data.h" #include "indeo4data.h"
#define IVI4_PIC_SIZE_ESC 7 #define IVI4_PIC_SIZE_ESC 7
......
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
#include <stdint.h> #include <stdint.h>
#include "ivi_common.h" #include "ivi.h"
#include "mathops.h"
/** /**
* standard picture dimensions * standard picture dimensions
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "ivi.h"
#include "ivi_dsp.h" #include "ivi_dsp.h"
#include "ivi_common.h"
#include "indeo5data.h" #include "indeo5data.h"
/** /**
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "mathops.h" #include "mathops.h"
#include "ivi_common.h" #include "ivi.h"
#include "ivi_dsp.h" #include "ivi_dsp.h"
/** /**
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
* Indeo5 decoders. * Indeo5 decoders.
*/ */
#ifndef AVCODEC_IVI_COMMON_H #ifndef AVCODEC_IVI_H
#define AVCODEC_IVI_COMMON_H #define AVCODEC_IVI_H
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
...@@ -342,4 +342,4 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ...@@ -342,4 +342,4 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
AVPacket *avpkt); AVPacket *avpkt);
int ff_ivi_decode_close(AVCodecContext *avctx); int ff_ivi_decode_close(AVCodecContext *avctx);
#endif /* AVCODEC_IVI_COMMON_H */ #endif /* AVCODEC_IVI_H */
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "ivi_common.h" #include "ivi.h"
#include "ivi_dsp.h" #include "ivi_dsp.h"
void ff_ivi_recompose53(const IVIPlaneDesc *plane, uint8_t *dst, void ff_ivi_recompose53(const IVIPlaneDesc *plane, uint8_t *dst,
......
...@@ -29,8 +29,9 @@ ...@@ -29,8 +29,9 @@
#ifndef AVCODEC_IVI_DSP_H #ifndef AVCODEC_IVI_DSP_H
#define AVCODEC_IVI_DSP_H #define AVCODEC_IVI_DSP_H
#include "avcodec.h" #include <stdint.h>
#include "ivi_common.h"
#include "ivi.h"
/** /**
* 5/3 wavelet recomposition filter for Indeo5 * 5/3 wavelet recomposition filter for Indeo5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment