> 在 2018年11月20日，上午9:51，hwrenx <hwr...@126.com> 写道：
>
> Signed-off-by: hwrenx <hwr...@126.com>
> ---
> configure | 2 +-
> libavcodec/libdavs2.c | 3 +++
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index b4f944c..1a9f874 100755
> --- a/configure
> +++ b/configure
> @@ -6076,7 +6076,7 @@ enabled libcelt && require libcelt
> celt/celt.h celt_decode -lcelt0 &&
> enabled libcaca && require_pkg_config libcaca caca caca.h
> caca_create_canvas
> enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create
> -lcodec2
> enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.0.1"
> "dav1d/dav1d.h" dav1d_version
> -enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.5.115"
> davs2.h davs2_decoder_open
> +enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0"
> davs2.h davs2_decoder_open
> enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2
> dc1394/dc1394.h dc1394_new
> enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h
> drmGetVersion
> enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac
> "fdk-aac/aacenc_lib.h" aacEncOpen ||
> diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c
> index 874f2f0..9a905b8 100644
> --- a/libavcodec/libdavs2.c
> +++ b/libavcodec/libdavs2.c
> @@ -40,11 +40,14 @@ typedef struct DAVS2Context {
> static av_cold int davs2_init(AVCodecContext *avctx)
> {
> DAVS2Context *cad = avctx->priv_data;
> + int cpu_flags = av_get_cpu_flags();
>
> /* init the decoder */
> cad->param.threads = avctx->thread_count;
> cad->param.info_level = 0;
> cad->decoder = davs2_decoder_open(&cad->param);
> + cad->param.disable_avx = !(cpu_flags & AV_CPU_FLAG_AVX &&
> + cpu_flags & AV_CPU_FLAG_AVX2);
>
> if (!cad->decoder) {
> av_log(avctx, AV_LOG_ERROR, "decoder created error.");
> --
> 2.7.4
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Patchset pushed
Thanks
Steven Liu
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
