| @@ -41,6 +41,9 @@ extern const IVIHuffDesc ff_ivi_blk_huff_desc[8]; ///< static block huffman tabl | |||||
| static VLC ivi_mb_vlc_tabs [8]; ///< static macroblock Huffman tables | static VLC ivi_mb_vlc_tabs [8]; ///< static macroblock Huffman tables | ||||
| static VLC ivi_blk_vlc_tabs[8]; ///< static block Huffman tables | static VLC ivi_blk_vlc_tabs[8]; ///< static block Huffman tables | ||||
| typedef void (*ivi_mc_func) (int16_t *buf, const int16_t *ref_buf, | |||||
| uint32_t pitch, int mc_type); | |||||
| /** | /** | ||||
| * Reverse "nbits" bits of the value "val" and return the result | * Reverse "nbits" bits of the value "val" and return the result | ||||
| * in the least significant bits. | * in the least significant bits. | ||||
| @@ -394,8 +397,7 @@ static int ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile | |||||
| uint32_t cbp, sym, lo, hi, quant, buf_offs, q; | uint32_t cbp, sym, lo, hi, quant, buf_offs, q; | ||||
| IVIMbInfo *mb; | IVIMbInfo *mb; | ||||
| RVMapDesc *rvmap = band->rv_map; | RVMapDesc *rvmap = band->rv_map; | ||||
| void (*mc_with_delta_func)(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type); | |||||
| void (*mc_no_delta_func) (int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type); | |||||
| ivi_mc_func mc_with_delta_func, mc_no_delta_func; | |||||
| const uint16_t *base_tab; | const uint16_t *base_tab; | ||||
| const uint8_t *scale_tab; | const uint8_t *scale_tab; | ||||
| @@ -567,8 +569,7 @@ static int ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band, | |||||
| IVIMbInfo *mb, *ref_mb; | IVIMbInfo *mb, *ref_mb; | ||||
| const int16_t *src; | const int16_t *src; | ||||
| int16_t *dst; | int16_t *dst; | ||||
| void (*mc_no_delta_func)(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, | |||||
| int mc_type); | |||||
| ivi_mc_func mc_no_delta_func; | |||||
| if (tile->num_MBs != IVI_MBs_PER_TILE(tile->width, tile->height, band->mb_size)) { | if (tile->num_MBs != IVI_MBs_PER_TILE(tile->width, tile->height, band->mb_size)) { | ||||
| av_log(avctx, AV_LOG_ERROR, "Allocated tile size %d mismatches " | av_log(avctx, AV_LOG_ERROR, "Allocated tile size %d mismatches " | ||||