From 60f09c04d80a31126f7eeaa669280887c5f4bc71 Mon Sep 17 00:00:00 2001 From: Alex Smith Date: Thu, 30 May 2013 20:11:21 +0000 Subject: [PATCH 1/2] configure: icl: Merge -Qdiag-error parameters Signed-off-by: Derek Buitenhuis --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 897e1ed3bf..73f4cd89b7 100755 --- a/configure +++ b/configure @@ -2619,7 +2619,7 @@ probe_cc(){ _ld_lib='lib%.a' _ld_path='-libpath:' # -Qdiag-error to make icl error when presented with certain unknown arguments - _flags='-nologo -Qdiag-error:10157 -Qdiag-error:4044' + _flags='-nologo -Qdiag-error:4044,10157' # -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency with msvc which enables it by default _cflags='-D_USE_MATH_DEFINES -Dinline=__inline -FIstdlib.h -Dstrtoll=_strtoi64 -Qms0 -Qvec- -Qsimd- -GS' if [ $pfx = hostcc ]; then From 33f64fd5d588a82b8bae1b1b5ea627c0c80b01d6 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Fri, 31 May 2013 21:09:27 +0200 Subject: [PATCH 2/2] indeo4: expand allowed quantiser range Indeo 4 has quantiser range 0-31 instead of 0-23 for Indeo 5, and clipping quantiser leads to incorrect quantisation and DC prediction on low-quality videos. This fixes bug 259. --- libavcodec/ivi_common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index f11b7292ef..f7e241bf91 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -418,7 +418,11 @@ static int ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile cbp = mb->cbp; buf_offs = mb->buf_offs; - quant = av_clip(band->glob_quant + mb->q_delta, 0, 23); + quant = band->glob_quant + mb->q_delta; + if (avctx->codec_id == AV_CODEC_ID_INDEO4) + quant = av_clip(quant, 0, 31); + else + quant = av_clip(quant, 0, 23); base_tab = is_intra ? band->intra_base : band->inter_base; scale_tab = is_intra ? band->intra_scale : band->inter_scale;