summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vf_pp7.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 18:59:15 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 18:59:15 +0200
commitb0986b3760b0174be6a58e1754353102f3230c79 (patch)
tree0c9f5a05216a547ae4ddf3b2669749f88ec3f801 /libmpcodecs/vf_pp7.c
parent5fc54a6caad5f24b993da2e282c896269a6abc49 (diff)
parent23db422c3d40a5202d61b5ca154cf5286d9ac0a5 (diff)
downloadmpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.bz2
mpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.xz
Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the default behavior as claimed in the commit message. It only breaks "-af-adv force=0", which was already pretty much useless though.
Diffstat (limited to 'libmpcodecs/vf_pp7.c')
-rw-r--r--libmpcodecs/vf_pp7.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpcodecs/vf_pp7.c b/libmpcodecs/vf_pp7.c
index 472838ecd6..56b196a3a3 100644
--- a/libmpcodecs/vf_pp7.c
+++ b/libmpcodecs/vf_pp7.c
@@ -321,7 +321,7 @@ static void filter(struct vf_priv_s *p, uint8_t *dst, uint8_t *src, int dst_stri
qp= p->qp;
else{
qp= qp_store[ (XMIN(x, width-1)>>qps) + (XMIN(y, height-1)>>qps) * qp_stride];
- if(p->mpeg2) qp>>=1;
+ qp=norm_qscale(qp, p->mpeg2);
}
for(; x<end; x++){
const int index= x + y*stride + (8-3)*(1+stride) + 8; //FIXME silly offset