changed minimal ffmpeg version to 3.4

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9709 90c681e8-e032-0410-971d-27865f9a5e38

6 files changed, 5 insertions, 13 deletions

diff --git a/README b/README
index 9afa3ef78..99d3a37d1 100644
--- a/README
+++ b/README
@@ -96,7 +96,7 @@ Requirements:
 - libsndfile >= 1.0.22 (optional)
 - wavpack >= 4.41 (optional)
 - pulseaudio >= 0.9.15 (optional)
-- ffmpeg >= 3.2 (optional)
+- ffmpeg >= 3.4 (optional)
 - libcdio >= 0.80 (optional)
 - libcdio-paranoia >= 10.2 (since libcdio 0.90)
 - libcddb >= 1.3.1 (optional)
diff --git a/README.RUS b/README.RUS
index ff7bd823b..e81a051c9 100644
--- a/README.RUS
+++ b/README.RUS
@@ -95,7 +95,7 @@ Qmmp - Qt-based multimedia player
 - libsndfile >= 1.0.22 (опционально)
 - wavpack >= 4.41 (опционально)
 - pulseaudio >= 0.9.15 (опционально)
-- ffmpeg >= 3.2 (опционально)
+- ffmpeg >= 3.4 (опционально)
 - libcdio >= 0.80 (опционально)
 - libcdio-paranoia >= 10.2 (начиная с libcdio 0.90)
 - libcddb >= 1.3.1 (опционально)
diff --git a/README.UKR b/README.UKR
index 9e7c0af1b..888710f0a 100644
--- a/README.UKR
+++ b/README.UKR
@@ -84,7 +84,7 @@ Qmmp - Qt-based multimedia player
 - libsndfile >= 1.0.21 (Опціонально)
 - wavpack >= 4.41 (Опціонально)
 - pulseaudio >= 0.9.15 (Опціонально)
-- ffmpeg >= 3.2 (Опціонально)
+- ffmpeg >= 3.4 (Опціонально)
 - libcdio >= 0.80 (Опціонально)
 - libcdio-paranoia >= 10.2 (починаючи з libcdio 0.90)
 - libcddb >= 1.3.1 (Опціонально)
diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt
index 539239558..0a347c4d7 100644
--- a/src/plugins/Input/ffmpeg/CMakeLists.txt
+++ b/src/plugins/Input/ffmpeg/CMakeLists.txt
@@ -10,8 +10,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 # minimal supported versions
-# ffmpeg-3.2: libavcodec-57.64.100, libavformat-57.56.100, libavutil-55.34.100
-pkg_check_modules(FFMPEG libavcodec>=57.64.0 libavformat>=57.56.0 libavutil>=55.34.0)
+# ffmpeg-3.4: libavcodec-57.107.100, libavformat-57.83.100, libavutil-55.78.100
+pkg_check_modules(FFMPEG libavcodec>=57.107.0 libavformat>=57.83.0 libavutil>=55.78.0)
 
 include_directories(${FFMPEG_INCLUDE_DIRS})
 link_directories(${FFMPEG_LIBRARY_DIRS})
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
index 3c0f4420c..03ed98e5d 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -84,11 +84,7 @@ DecoderFFmpeg::~DecoderFFmpeg()
     av_packet_free(&m_pkt);
 
     if(m_stream)
-#if (LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 80, 100)) //ffmpeg-3.4
         avio_context_free(&m_stream);
-#else
-        av_free(m_stream);
-#endif
 
     if(m_frame)
         av_frame_free(&m_frame);
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index 8931aad66..b1f9228ee 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -222,11 +222,7 @@ QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, Tra
         int idx = av_find_best_stream(in, AVMEDIA_TYPE_AUDIO, -1, -1, nullptr, 0);
         if(idx >= 0)
         {
-    #if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,48,0)) //ffmpeg-3.1:  57.48.101
             AVCodecParameters *c = in->streams[idx]->codecpar;
-    #else
-            AVCodecContext *c = in->streams[idx]->codec;
-    #endif
             info->setValue(Qmmp::BITRATE, int(c->bit_rate) / 1000);
             info->setValue(Qmmp::SAMPLERATE, c->sample_rate);
             info->setValue(Qmmp::CHANNELS, c->channels);