diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-30 13:52:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-30 13:52:48 +0200 |
| commit | e5ce6d447b952658b8a8568c807baeab5cf58783 (patch) | |
| tree | 74af04c23abf7c610e0e944a7df4c7ca87f67a2f /libavcodec/ivi_common.h | |
| parent | 301f6da0397eb8955adf355229521997390d918a (diff) | |
| parent | d05f72c75445969cd7bdb1d860635c9880c67fb6 (diff) | |
| download | ffmpeg-streaming-e5ce6d447b952658b8a8568c807baeab5cf58783.zip ffmpeg-streaming-e5ce6d447b952658b8a8568c807baeab5cf58783.tar.gz | |
Merge commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6'
* commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6':
dfa: improve boundary checks in decode_dds1()
wmalosslessdec: Fix reading too many bits in decode_channel_residues()
wmalosslessdec: fix a get_bits(0) in decode_ac_filter
wmalosslessdec: make MCLMS arrays big enough for what is written into them.
indeo4/5: check empty tile size in decode_mb_info().
ivi_common: make ff_ivi_process_empty_tile() static.
indeo5: check tile size in decode_mb_info().
indeo3: fix out of cell write.
Conflicts:
libavcodec/dfa.c
libavcodec/indeo3.c
libavcodec/indeo5.c
libavcodec/ivi_common.c
libavcodec/wmalosslessdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ivi_common.h')
| -rw-r--r-- | libavcodec/ivi_common.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h index fae7f4b..4636f6c 100644 --- a/libavcodec/ivi_common.h +++ b/libavcodec/ivi_common.h @@ -378,18 +378,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. |
