fb61ed1e9f
* commit 'ac4b32df71bd932838043a4838b86d11e169707f':
On2 VP7 decoder
Conflicts:
Changelog
libavcodec/arm/h264pred_init_arm.c
libavcodec/arm/vp8dsp.h
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/arm/vp8dsp_init_armv6.c
libavcodec/arm/vp8dsp_init_neon.c
libavcodec/avcodec.h
libavcodec/h264pred.c
libavcodec/version.h
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c
libavcodec/vp8dsp.h
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/vp8dsp_init.c
See: 89f2f5dbd7 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
45 lines
1.3 KiB
C
45 lines
1.3 KiB
C
/*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "libavutil/attributes.h"
|
|
#include "libavutil/arm/cpu.h"
|
|
#include "libavcodec/vp8dsp.h"
|
|
#include "vp8dsp.h"
|
|
|
|
av_cold void ff_vp78dsp_init_arm(VP8DSPContext *dsp)
|
|
{
|
|
int cpu_flags = av_get_cpu_flags();
|
|
|
|
if (have_armv6(cpu_flags))
|
|
ff_vp78dsp_init_armv6(dsp);
|
|
if (have_neon(cpu_flags))
|
|
ff_vp78dsp_init_neon(dsp);
|
|
}
|
|
|
|
av_cold void ff_vp8dsp_init_arm(VP8DSPContext *dsp)
|
|
{
|
|
int cpu_flags = av_get_cpu_flags();
|
|
|
|
if (have_armv6(cpu_flags))
|
|
ff_vp8dsp_init_armv6(dsp);
|
|
if (have_neon(cpu_flags))
|
|
ff_vp8dsp_init_neon(dsp);
|
|
}
|