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

diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h
index 2028ec9..8d466c6 100644 (file)
--- 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;