Browse code

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

Maxim Poliakovski authored on 2010/06/11 17:49:15
Showing 1 changed files
... ...
@@ -76,6 +76,13 @@ extern const uint8_t ff_ivi_direct_scan_4x4[16];
76 76
 
77 77
 
78 78
 /**
79
+ *  Declare inverse transform function types
80
+ */
81
+typedef void (InvTransformPtr)(const int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags);
82
+typedef void (DCTransformPtr) (const int32_t *in, int16_t *out, uint32_t pitch, int blk_size);
83
+
84
+
85
+/**
79 86
  *  run-value (RLE) table descriptor
80 87
  */
81 88
 typedef struct {
... ...
@@ -152,8 +159,8 @@ typedef struct {
152 152
     RVMapDesc       *rv_map;        ///< ptr to the RLE table for this band
153 153
     int             num_tiles;      ///< number of tiles in this band
154 154
     IVITile         *tiles;         ///< array of tile descriptors
155
-    void (*inv_transform)(const int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags); ///< inverse transform function pointer
156
-    void (*dc_transform) (const int32_t *in, int16_t *out, uint32_t pitch, int blk_size);   ///< dc transform function pointer, it may be NULL
155
+    InvTransformPtr *inv_transform;
156
+    DCTransformPtr  *dc_transform;
157 157
     int             is_2d_trans;    ///< 1 indicates that the two-dimensional inverse transform is used
158 158
     int32_t         checksum;       ///< for debug purposes
159 159
     int             checksum_present;