fixed libav support

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

2 files changed, 4 insertions, 2 deletions

diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
index 4117b35e1..1155cddaa 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -313,7 +313,7 @@ bool DecoderFFmpeg::initialize()
         return false;
     }
 
-    setProperty(Qmmp::FORMAT_NAME, QString::fromLatin1(avcodec_get_name(c->codec_id)));
+    setProperty(Qmmp::FORMAT_NAME, QString::fromLatin1(c->codec->name));
     configure(c->sample_rate, m_channels, format);
 
     if(ic->bit_rate)
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index e353f2af7..8ec2e7630 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -213,7 +213,9 @@ QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, Tra
             info->setValue(Qmmp::CHANNELS, c->channels);
             info->setValue(Qmmp::BITS_PER_SAMPLE, c->bits_per_raw_sample);
 
-            info->setValue(Qmmp::FORMAT_NAME, QString::fromLatin1(avcodec_get_name(c->codec_id)));
+            AVCodec *codec = avcodec_find_decoder(c->codec_id);
+            if(codec)
+                info->setValue(Qmmp::FORMAT_NAME, QString::fromLatin1(codec->name));
             info->setValue(Qmmp::FILE_SIZE, QFileInfo(filePath).size()); //adds file size for cue tracks
             info->setDuration(in->duration * 1000 / AV_TIME_BASE);
         }