diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-08 12:47:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-08 12:47:49 +0200 |
| commit | 024a5f72eec54b9a3fcaa6fc568ae1e21ac0a6a6 (patch) | |
| tree | dc8b9841d15035432678b76cd438ecdd9ba7b55f /libavcodec/vp3.c | |
| parent | 5f49e92eb934d56fc1f031b579281ce48c251c4f (diff) | |
| parent | 9e0f14f16cfc9456a691655fda7d01090bffe47e (diff) | |
| download | ffmpeg-024a5f72eec54b9a3fcaa6fc568ae1e21ac0a6a6.tar.gz | |
Merge commit '9e0f14f16cfc9456a691655fda7d01090bffe47e'
* commit '9e0f14f16cfc9456a691655fda7d01090bffe47e':
lavc: Make pointers to ff_cropTbl const
vp3: Embed idct_permutation array directly in VP3DecoderContext
Conflicts:
libavcodec/bit_depth_template.c
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp3.c')
| -rw-r--r-- | libavcodec/vp3.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index ed5e5343ac..5bf2feed58 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -381,7 +381,8 @@ static void init_dequantizer(Vp3DecodeContext *s, int qpi) int qmin= 8<<(inter + !i); int qscale= i ? ac_scale_factor : dc_scale_factor; - s->qmat[qpi][inter][plane][s->idct_permutation[i]]= av_clip((qscale * coeff)/100 * 4, qmin, 4096); + s->qmat[qpi][inter][plane][s->idct_permutation[i]] = + av_clip((qscale * coeff) / 100 * 4, qmin, 4096); } // all DC coefficients use the same quant so as not to interfere with DC prediction s->qmat[qpi][inter][plane][0] = s->qmat[0][inter][plane][0]; |