summaryrefslogtreecommitdiff
path: root/libavcodec/x86
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-05 10:25:53 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-05 10:26:07 +0100
commit934e489ee8f48cfe8ba18c57a9708b830b613c4d (patch)
tree758f50fb9f8fd695ee55227402c5ca3a583be958 /libavcodec/x86
parent04047b6166b3bf77378dbeac91f08dbb02deec23 (diff)
parente2b5b097898c9155f4bdff4d83cdc54d5eef6930 (diff)
Merge commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930'
* commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930': x86: rv40dsp: Use PAVGB instruction macro where appropriate Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
-rw-r--r--libavcodec/x86/rv40dsp.asm6
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/x86/rv40dsp.asm b/libavcodec/x86/rv40dsp.asm
index e561935da7..792a54f572 100644
--- 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