From 68662a3db8632f76dfa7b43b24ddbdad6dd5e9cd Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 31 Dec 2019 08:19:51 +0000 Subject: changed minimal ffmpeg version to 3.2, removed libav support git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9174 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp') diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp index d12931d19..eeb7d3681 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2019 by Ilya Kotov * + * Copyright (C) 2009-2020 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -48,19 +48,12 @@ FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path) : MetaDataModel(tr avformat_find_stream_info(in, nullptr); av_read_play(in); -#if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,48,0)) //ffmpeg-3.1: 57.48.101 AVCodecParameters *c = nullptr; -#else - AVCodecContext *c = nullptr; -#endif for (uint idx = 0; idx < in->nb_streams; idx++) { -#if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,48,0)) //ffmpeg-3.1: 57.48.101 c = in->streams[idx]->codecpar; -#else - c = in->streams[idx]->codec; -#endif + if (c->codec_type == AVMEDIA_TYPE_VIDEO && c->codec_id == AV_CODEC_ID_MJPEG) break; } -- cgit v1.2.3-13-gbd6f