diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 14:12:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 14:12:14 +0100 |
| commit | acada70ffbd729516495ee683f70abad124f93d5 (patch) | |
| tree | 3c4626e79bca9730658665863ec93e038a8ad93e /libavcodec/ivi_common.h | |
| parent | 4f91c45644931064901986bca70a8903c7956564 (diff) | |
| parent | db5b454c3d20f0e2e7fff8f0091e776ae9757725 (diff) | |
| download | ffmpeg-acada70ffbd729516495ee683f70abad124f93d5.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
* qatar/release/0.7:
Update changelog for 0.7.7 release
mpeg12: do not decode extradata more than once.
indeo4/5: check empty tile size in decode_mb_info().
dfa: improve boundary checks in decode_dds1()
indeo5dec: Make sure we have had a valid gop header.
rv34: error out on size changes with frame threading
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ivi_common.h')
| -rw-r--r-- | libavcodec/ivi_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h index aeeaf53cc4..654ee6f2bc 100644 --- a/libavcodec/ivi_common.h +++ b/libavcodec/ivi_common.h @@ -325,7 +325,7 @@ int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile); * @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, +int ff_ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band, IVITile *tile, int32_t mv_scale); /** |