diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2012-08-21 17:12:41 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-08-21 17:12:41 -0700 |
| commit | 1b5e5e9279217857c4431cd1f0286b5a2c1b6268 (patch) | |
| tree | e8d1b9d89c5ce55dae08e0bce115f2558ed8ab3d | |
| parent | 8c2a6cac41aa8b4ce5db266dbe25657f6f15edde (diff) | |
| parent | 94465c1937c2dee82b7648c25177531a25225c68 (diff) | |
| download | libvpx-1b5e5e9279217857c4431cd1f0286b5a2c1b6268.tar libvpx-1b5e5e9279217857c4431cd1f0286b5a2c1b6268.tar.gz libvpx-1b5e5e9279217857c4431cd1f0286b5a2c1b6268.tar.bz2 libvpx-1b5e5e9279217857c4431cd1f0286b5a2c1b6268.zip | |
Merge "Fix mismatch caused by a rebase failure." into experimental
| -rw-r--r-- | vp8/common/reconintra.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/common/reconintra.c b/vp8/common/reconintra.c index e391fa9be..e84afa139 100644 --- a/vp8/common/reconintra.c +++ b/vp8/common/reconintra.c @@ -218,7 +218,7 @@ void vp8_build_intra_predictors_internal(MACROBLOCKD *xd, int r, c, i; for (i = 0; i < bsize; i++) { - yleft_col[i] = xd->dst.y_buffer [i * src_stride - 1]; + yleft_col[i] = src[i * src_stride - 1]; } /* for Y */ |