aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-09-29 11:06:54 +0200
committerAnton Khirnov <anton@khirnov.net>2012-09-29 19:12:57 +0200
commit5d2170c53bf4c2b0499f230c43764e4acf228f88 (patch)
tree7c460759c50b625d4b552f43ad5f18bc09e11447 /libavcodec
parent2d09cdbaf2f449ba23d54e97e94bd97ca22208c6 (diff)
downloadffmpeg-5d2170c53bf4c2b0499f230c43764e4acf228f88.tar.gz
ivi_common: make ff_ivi_process_empty_tile() static.
It's not used outside of ivi_common.c
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ivi_common.c15
-rw-r--r--libavcodec/ivi_common.h12
2 files changed, 12 insertions, 15 deletions
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
index 6ff0f8028b..65fc500d74 100644
--- a/libavcodec/ivi_common.c
+++ b/libavcodec/ivi_common.c
@@ -489,8 +489,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;
@@ -673,7 +682,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 edbe96a1ee..1b654f8ead 100644
--- a/libavcodec/ivi_common.h
+++ b/libavcodec/ivi_common.h
@@ -376,18 +376,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.