Merge commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930'

* commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930': x86: rv40dsp: Use PAVGB instruction macro where appropriate Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 10:25:53 +01:00 · 2013-11-05 10:25:53 +01:00 · 934e489ee8
parent 04047b6166 e2b5b09789
commit 934e489ee8
1 changed files with 1 additions and 5 deletions
--- a/libavcodec/x86/rv40dsp.asm
+++ b/libavcodec/x86/rv40dsp.asm
@ -98,11 +98,7 @@ SECTION .text
 %endif
    packuswb  %1, %1
 %ifidn %3, avg
-%if cpuflag(3dnow)
-    pavgusb   %1, %2
-%else
-    pavgb     %1, %2
-%endif
+    PAVGB     %1, %2
 %endif
    movh  [dstq], %1
 %endmacro