diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-01 10:27:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-01 10:27:47 +0200 |
| commit | 0c2f673ed28ab6d187b4ce41396623f9e9378785 (patch) | |
| tree | f86207e19c7fec004e7f229b9ffc037682fff6da | |
| parent | b919a8d3a38559bb5f60a66839ca6f3358b1c908 (diff) | |
| parent | 33f64fd5d588a82b8bae1b1b5ea627c0c80b01d6 (diff) | |
| download | ffmpeg-0c2f673ed28ab6d187b4ce41396623f9e9378785.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo4: expand allowed quantiser range
configure: icl: Merge -Qdiag-error parameters
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/ivi_common.c | 6 |
2 files changed, 6 insertions, 2 deletions
@@ -2930,7 +2930,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 diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index 250c6da874..53a2d2b1f0 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -425,7 +425,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; |