diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 11:44:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 11:44:45 +0100 |
| commit | 68f92a70f1f486c8bc01a1e747a017a6f8dd6861 (patch) | |
| tree | b89449f185b6cb80450e019ab61ed978f1c47047 /libavutil | |
| parent | f245a2086a10327d0fd5ffd0500721729017c772 (diff) | |
| parent | dae1d507af94261bafd3b11549884e5d1eca590e (diff) | |
| download | ffmpeg-68f92a70f1f486c8bc01a1e747a017a6f8dd6861.tar.gz | |
Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e'
* commit 'dae1d507af94261bafd3b11549884e5d1eca590e':
x86: Add PAVGB macro to abstract pavgb/pavgusb instruction via cpuflags
vf_fps: add final flushed frames to the dropped frame count
rv34_parser: Adjust #if for disabling individual parsers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/x86util.asm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index 8fac13a9b3..1b3bf73773 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -301,6 +301,14 @@ %endif %endmacro +%macro PAVGB 2 +%if cpuflag(mmxext) + pavgb %1, %2 +%elif cpuflag(3dnow) + pavgusb %1, %2 +%endif +%endmacro + %macro PSHUFLW 1+ %if mmsize == 8 pshufw %1 |