From c820141600c192a62fb416311977982c87a8f174 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 10 Feb 2018 20:10:23 +0000 Subject: ffmpeg plugin: fixed ffmpeg 3.5 support git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7842 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp') diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 4728a8f7f..eaf4d9edf 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2017 by Ilya Kotov * + * Copyright (C) 2008-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -38,9 +38,11 @@ extern "C"{ DecoderFFmpegFactory::DecoderFFmpegFactory() { +#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,10,100)) //ffmpeg-3.5 avcodec_register_all(); avformat_network_init(); av_register_all(); +#endif } bool DecoderFFmpegFactory::canDecode(QIODevice *i) const -- cgit v1.2.3-13-gbd6f