summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-13 19:57:14 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-13 19:57:14 +0000
commita4eb406825832bdfad875e5b6cf6b9a2248fd74a (patch)
treeb5eb68bece51da532b68796da7bb2ccb672d264c /media
parent9464e89b394f65e216c19668d180d58667bccd08 (diff)
downloadchromium_src-a4eb406825832bdfad875e5b6cf6b9a2248fd74a.zip
chromium_src-a4eb406825832bdfad875e5b6cf6b9a2248fd74a.tar.gz
chromium_src-a4eb406825832bdfad875e5b6cf6b9a2248fd74a.tar.bz2
Merge 44368 - Fix windows scaling bug
BUG=41294 TEST=scale a video up on windows with filtering enabled. Review URL: http://codereview.chromium.org/1645004 TBR=fbarchard@chromium.org Review URL: http://codereview.chromium.org/1566039 git-svn-id: svn://svn.chromium.org/chrome/branches/375/src@44385 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/yuv_row_win.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/media/base/yuv_row_win.cc b/media/base/yuv_row_win.cc
index 33712db..c7cf8d3 100644
--- a/media/base/yuv_row_win.cc
+++ b/media/base/yuv_row_win.cc
@@ -578,11 +578,9 @@ __asm {
mov edx, [esp + 32 + 4]
mov edi, [esp + 32 + 8]
mov ebp, [esp + 32 + 16]
- mov ebx, ebx
-
- // width = width * scaled_dx + ebx
- mov ecx, [esp + 32 + 20]
+ mov ecx, [esp + 32 + 20] // width = width * scaled_dx + ebx
imul ecx, [esp + 32 + 24]
+ xor ebx, ebx
add ecx, ebx
mov [esp + 32 + 20], ecx
jmp lscaleend