diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-07-03 11:18:30 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-07-07 21:11:34 +0200 |
| commit | c9d8424395fc9e277f8d70ad55a8f2f74c57a49b (patch) | |
| tree | 244e5452ccd3fb2e5c616af95685a8d3066a0f5b | |
| parent | e6a365b5d2fc8010558ae9a0c3e9749819ad9d45 (diff) | |
| download | ffmpeg-c9d8424395fc9e277f8d70ad55a8f2f74c57a49b.tar.gz | |
indeo: use a typedef for the mc function pointer
(cherry picked from commit e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/ivi_common.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index 36e355a87f..c907e2a4d1 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -39,6 +39,9 @@ extern const IVIHuffDesc ff_ivi_blk_huff_desc[8]; ///< static block huffman tabl VLC ff_ivi_mb_vlc_tabs [8]; VLC ff_ivi_blk_vlc_tabs[8]; +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 * in the least significant bits. @@ -343,8 +346,7 @@ int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile) uint32_t cbp, sym, lo, hi, quant, buf_offs, q; IVIMbInfo *mb; 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 uint8_t *scale_tab; @@ -514,8 +516,7 @@ static int ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band, IVIMbInfo *mb, *ref_mb; const int16_t *src; 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)) { av_log(avctx, AV_LOG_ERROR, "Allocated tile size %d mismatches " |