diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-23 00:27:52 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-23 00:27:52 -0400 |
| commit | 51bcf621c174a5970a0f455572e3e3cf28cab5dd (patch) | |
| tree | 356d9b44265a40db88fa62064115095dca5014e9 /vp8/encoder/encodeframe.c | |
| parent | 9f0082296817b7fe5101d3fca1e67b2524b41a73 (diff) | |
| parent | edfc93aebac7674f26ed4c0389d97ae15e8b8c2b (diff) | |
| download | libvpx-51bcf621c174a5970a0f455572e3e3cf28cab5dd.tar libvpx-51bcf621c174a5970a0f455572e3e3cf28cab5dd.tar.gz libvpx-51bcf621c174a5970a0f455572e3e3cf28cab5dd.tar.bz2 libvpx-51bcf621c174a5970a0f455572e3e3cf28cab5dd.zip | |
Merge remote branch 'internal/upstream' into HEAD
Conflicts:
vp8/decoder/decodemv.c
vp8/decoder/onyxd_if.c
vp8/encoder/ratectrl.c
vp8/encoder/rdopt.c
Change-Id: Ia1c1c5e589f4200822d12378c7749ba62bd17ae2
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 6d7e3de5e..3d280005d 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -861,7 +861,7 @@ void vp8_encode_frame(VP8_COMP *cpi) vp8cx_init_mbrthread_data(cpi, x, cpi->mb_row_ei, 1, cpi->encoding_thread_count); for (i = 0; i < cm->mb_rows; i++) - cpi->mt_current_mb_col[i] = 0; + cpi->mt_current_mb_col[i] = -1; for (i = 0; i < cpi->encoding_thread_count; i++) { |