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 | |
| 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>
| -rw-r--r-- | libavcodec/x86/h264_chromamc.asm | 7 | ||||
| -rw-r--r-- | libavfilter/vf_fps.c | 1 | ||||
| -rw-r--r-- | libavutil/x86/x86util.asm | 8 |
3 files changed, 11 insertions, 5 deletions
diff --git a/libavcodec/x86/h264_chromamc.asm b/libavcodec/x86/h264_chromamc.asm index 7f5be7521f..867ba4927c 100644 --- a/libavcodec/x86/h264_chromamc.asm +++ b/libavcodec/x86/h264_chromamc.asm @@ -427,11 +427,11 @@ cglobal %1_%2_chroma_mc2, 6, 7, 0 %macro NOTHING 2-3 %endmacro %macro DIRECT_AVG 2 - PAVG %1, %2 + PAVGB %1, %2 %endmacro %macro COPY_AVG 3 movd %2, %3 - PAVG %1, %2 + PAVGB %1, %2 %endmacro INIT_MMX mmx @@ -448,7 +448,6 @@ chroma_mc2_mmx_func put, h264 %define CHROMAMC_AVG DIRECT_AVG %define CHROMAMC_AVG4 COPY_AVG -%define PAVG pavgb chroma_mc8_mmx_func avg, h264, _rnd chroma_mc8_mmx_func avg, vc1, _nornd chroma_mc8_mmx_func avg, rv40 @@ -456,7 +455,6 @@ chroma_mc4_mmx_func avg, h264 chroma_mc4_mmx_func avg, rv40 chroma_mc2_mmx_func avg, h264 -%define PAVG pavgusb INIT_MMX 3dnow chroma_mc8_mmx_func avg, h264, _rnd chroma_mc8_mmx_func avg, vc1, _nornd @@ -673,7 +671,6 @@ INIT_MMX ssse3 chroma_mc4_ssse3_func put, h264 %define CHROMAMC_AVG DIRECT_AVG -%define PAVG pavgb INIT_XMM ssse3 chroma_mc8_ssse3_func avg, h264, _rnd chroma_mc8_ssse3_func avg, vc1, _nornd diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c index d4305e7273..29eedc7cf5 100644 --- a/libavfilter/vf_fps.c +++ b/libavfilter/vf_fps.c @@ -109,6 +109,7 @@ static av_cold void uninit(AVFilterContext *ctx) { FPSContext *s = ctx->priv; if (s->fifo) { + s->drop += av_fifo_size(s->fifo) / sizeof(AVFilterBufferRef*); flush_fifo(s->fifo); av_fifo_free(s->fifo); } 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 |