diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 12:59:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 13:00:41 +0200 |
| commit | bf7ed956ffcd390b3f5ead2b36d47b068f89178f (patch) | |
| tree | 9cdd1e203de9e57536cc3263320506cc69944cec /libavcodec/arm | |
| parent | 77aafadc5655401e5806daed58300a2cccb19fb8 (diff) | |
| parent | adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed (diff) | |
| download | ffmpeg-bf7ed956ffcd390b3f5ead2b36d47b068f89178f.tar.gz | |
Merge commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed'
* commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed':
vc-1: Add platform-specific start code search routine to VC1DSPContext.
Conflicts:
configure
libavcodec/arm/vc1dsp_init_arm.c
libavcodec/vc1dsp.c
libavcodec/vc1dsp.h
See: 9d8ecdd8ca6d248e7439e8fdf255e39eda14e0f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/arm/vc1dsp_init_arm.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index 3daf21104d..41485b38d2 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -66,8 +66,6 @@ ARMV6-OBJS-$(CONFIG_PIXBLOCKDSP) += arm/pixblockdsp_armv6.o ARMV6-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv6.o ARMV6-OBJS-$(CONFIG_STARTCODE) += arm/startcode_armv6.o -ARMV6-OBJS-$(CONFIG_VC1_DECODER) += arm/startcode_armv6.o -ARMV6-OBJS-$(CONFIG_VC1_PARSER) += arm/startcode_armv6.o ARMV6-OBJS-$(CONFIG_VP7_DECODER) += arm/vp8_armv6.o \ arm/vp8dsp_init_armv6.o \ arm/vp8dsp_armv6.o diff --git a/libavcodec/arm/vc1dsp_init_arm.c b/libavcodec/arm/vc1dsp_init_arm.c index 4a84848463..9dae22c822 100644 --- a/libavcodec/arm/vc1dsp_init_arm.c +++ b/libavcodec/arm/vc1dsp_init_arm.c @@ -20,17 +20,16 @@ #include "libavutil/attributes.h" #include "libavutil/arm/cpu.h" +#include "libavcodec/arm/startcode.h" #include "libavcodec/vc1dsp.h" #include "vc1dsp.h" -int ff_startcode_find_candidate_armv6(const uint8_t *buf, int size); - av_cold void ff_vc1dsp_init_arm(VC1DSPContext *dsp) { int cpu_flags = av_get_cpu_flags(); - if (have_armv6(cpu_flags)) - dsp->vc1_find_start_code_candidate = ff_startcode_find_candidate_armv6; + if (have_setend(cpu_flags)) + dsp->startcode_find_candidate = ff_startcode_find_candidate_armv6; if (have_neon(cpu_flags)) ff_vc1dsp_init_neon(dsp); } |