diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-08-16 00:05:05 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-08-16 00:05:05 -0400 |
| commit | f54d561fa855997a08f0da598d4869f0347f295d (patch) | |
| tree | 97b44e81230f0233a865fb303e999bfdcf204bb5 /vp8/decoder | |
| parent | f783b6eba7d2daa841f46c26e936c98dcdd55a3e (diff) | |
| parent | 9cc16115885ee20c81cd0ec5ba9bf4ae46af00de (diff) | |
| download | libvpx-f54d561fa855997a08f0da598d4869f0347f295d.tar libvpx-f54d561fa855997a08f0da598d4869f0347f295d.tar.gz libvpx-f54d561fa855997a08f0da598d4869f0347f295d.tar.bz2 libvpx-f54d561fa855997a08f0da598d4869f0347f295d.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/decoder')
| -rw-r--r-- | vp8/decoder/error_concealment.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/vp8/decoder/error_concealment.c b/vp8/decoder/error_concealment.c index 4f8f1a66c..7051bb927 100644 --- a/vp8/decoder/error_concealment.c +++ b/vp8/decoder/error_concealment.c @@ -567,7 +567,6 @@ static void interpolate_mvs(MACROBLOCKD *mb, else { mv->as_int = 0; - mi->bmi[row*4 + col].as_mode = NEW4X4; mi->mbmi.need_to_clamp_mvs = 0; } } |