Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / ffmpeg / libavcodec / x86 / vp9intrapred.asm

diff --git a/src/third_party/ffmpeg/libavcodec/x86/vp9intrapred.asm b/src/third_party/ffmpeg/libavcodec/x86/vp9intrapred.asm
index 1d8d219..c710793 100644 (file)
--- a/src/third_party/ffmpeg/libavcodec/x86/vp9intrapred.asm
+++ b/src/third_party/ffmpeg/libavcodec/x86/vp9intrapred.asm
@@ -33,11 +33,7 @@ SECTION_RODATA 32
 
 pw_m256: times 16 dw -256
 pw_m255: times 16 dw -255
-pw_512:  times 8 dw  512
-pw_1024: times 8 dw 1024
-pw_2048: times 8 dw 2048
 pw_4096: times 8 dw 4096
-pw_8192: times 8 dw 8192
 
 pb_4x3_4x2_4x1_4x0: times 4 db 3
                     times 4 db 2
@@ -77,6 +73,10 @@ pb_15: times 16 db 15
 
 cextern pb_1
 cextern pb_3
+cextern pw_512
+cextern pw_1024
+cextern pw_2048
+cextern pw_8192
 
 SECTION .text
 
@@ -1374,7 +1374,7 @@ cglobal vp9_ipred_hd_32x32, 4, 6, 8, dst, stride, l, a
     palignr                 m6, m1, m0,  1
     palignr                 m1, m0,  2
     LOWPASS                  1,  6,  0,  7
-    pavgb                   m0, m1
+    pavgb                   m0, m6
     SBUTTERFLY              bw,  2,  3,  6
     SBUTTERFLY              bw,  0,  1,  6