Merge commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e'

[ffmpeg] / libavcodec / ivi_common.h

diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h
index fae7f4bea5fc2014788181448162fbcc4de7c376..4636f6ce524ca6a314adf492e7711e91d0eb8277 100644 (file)
--- a/libavcodec/ivi_common.h
+++ b/libavcodec/ivi_common.h
@@ -377,18 +377,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