aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMaxim Poliakovski <max_pole@gmx.de>2010-06-11 08:49:15 +0000
committerMaxim Poliakovski <max_pole@gmx.de>2010-06-11 08:49:15 +0000
commitc404e783b9a07d0f512298eaf24b76a6b31583f7 (patch)
treec66726aa6ee2003d4a471926eaff19fbe6c8c747 /libavcodec
parent756e346798021b23357cdfbcb99ceb936ddcb0eb (diff)
downloadffmpeg-c404e783b9a07d0f512298eaf24b76a6b31583f7.tar.gz
Move transform declarations out of IVIBandDesc so indeo4 can use them as well.
Originally committed as revision 23577 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ivi_common.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h
index 2028ec9e0c..8d466c6ca1 100644
--- a/libavcodec/ivi_common.h
+++ b/libavcodec/ivi_common.h
@@ -76,6 +76,13 @@ extern const uint8_t ff_ivi_direct_scan_4x4[16];
/**
+ * Declare inverse transform function types
+ */
+typedef void (InvTransformPtr)(const int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags);
+typedef void (DCTransformPtr) (const int32_t *in, int16_t *out, uint32_t pitch, int blk_size);
+
+
+/**
* run-value (RLE) table descriptor
*/
typedef struct {
@@ -152,8 +159,8 @@ typedef struct {
RVMapDesc *rv_map; ///< ptr to the RLE table for this band
int num_tiles; ///< number of tiles in this band
IVITile *tiles; ///< array of tile descriptors
- void (*inv_transform)(const int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags); ///< inverse transform function pointer
- void (*dc_transform) (const int32_t *in, int16_t *out, uint32_t pitch, int blk_size); ///< dc transform function pointer, it may be NULL
+ InvTransformPtr *inv_transform;
+ DCTransformPtr *dc_transform;
int is_2d_trans; ///< 1 indicates that the two-dimensional inverse transform is used
int32_t checksum; ///< for debug purposes
int checksum_present;