diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-09-29 11:06:54 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-10-14 16:03:24 -0400 |
| commit | 332555f6604964186ee4744e433c38119fd9853d (patch) | |
| tree | ee9524c89626c6682c1c7da3b50cb2dee738940d | |
| parent | c5ec1908597824e93bbe20137ac9662f84f3cb07 (diff) | |
| download | ffmpeg-332555f6604964186ee4744e433c38119fd9853d.tar.gz | |
ivi_common: make ff_ivi_process_empty_tile() static.
It's not used outside of ivi_common.c
(cherry picked from commit 5d2170c53bf4c2b0499f230c43764e4acf228f88)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/ivi_common.c | 15 | ||||
| -rw-r--r-- | libavcodec/ivi_common.h | 12 |
2 files changed, 12 insertions, 15 deletions
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index 41e66b1bfb..9f4f610999 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -491,8 +491,17 @@ int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile) return 0; } -void ff_ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band, - IVITile *tile, int32_t mv_scale) +/** + * Handle empty tiles by performing data copying and motion + * compensation respectively. + * + * @param[in] avctx ptr to the AVCodecContext + * @param[in] band pointer to the band descriptor + * @param[in] tile pointer to the tile descriptor + * @param[in] mv_scale scaling factor for motion vectors + */ +static void ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band, + IVITile *tile, int32_t mv_scale) { int x, y, need_mc, mbn, blk, num_blocks, mv_x, mv_y, mc_type; int offs, mb_offset, row_offset; @@ -696,7 +705,7 @@ static int decode_band(IVI45DecContext *ctx, int plane_num, } tile->is_empty = get_bits1(&ctx->gb); if (tile->is_empty) { - ff_ivi_process_empty_tile(avctx, band, tile, + ivi_process_empty_tile(avctx, band, tile, (ctx->planes[0].bands[0].mb_size >> 3) - (band->mb_size >> 3)); av_dlog(avctx, "Empty tile encountered!\n"); } else { diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h index 8c37b94da5..d52450a13b 100644 --- a/libavcodec/ivi_common.h +++ b/libavcodec/ivi_common.h @@ -374,18 +374,6 @@ int ff_ivi_dec_tile_data_size(GetBitContext *gb); int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile); /** - * Handle empty tiles by performing data copying and motion - * compensation respectively. - * - * @param[in] avctx ptr to the AVCodecContext - * @param[in] band pointer to the band descriptor - * @param[in] tile pointer to the tile descriptor - * @param[in] mv_scale scaling factor for motion vectors - */ -void ff_ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band, - IVITile *tile, int32_t mv_scale); - -/** * Convert and output the current plane. * This conversion is done by adding back the bias value of 128 * (subtracted in the encoder) and clipping the result. |