diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-12-01 18:08:13 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-12-01 18:08:13 +0000 |
| commit | db5f3f8b49d4f7b7a7a72d71f7ad65c5720e9113 (patch) | |
| tree | b1ab97f5fefdf227369732da12c9c381f6334381 /src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp | |
| parent | 171402255e57cf2cfe125a7d8b56ce3f7cb2a25f (diff) | |
| download | qmmp-db5f3f8b49d4f7b7a7a72d71f7ad65c5720e9113.tar.gz qmmp-db5f3f8b49d4f7b7a7a72d71f7ad65c5720e9113.tar.bz2 qmmp-db5f3f8b49d4f7b7a7a72d71f7ad65c5720e9113.zip | |
ffmpeg plugin: ffmpeg 0.8.x support, removed previous versions support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2528 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp')
| -rw-r--r-- | src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp index cbabfe1f1..b8c9ff9eb 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp @@ -26,7 +26,7 @@ FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path, QObject *parent) : avcodec_init(); avcodec_register_all(); av_register_all(); - if (av_open_input_file(&m_in, path.toLocal8Bit(), NULL,0, NULL) < 0) + if (avformat_open_input(&m_in, path.toLocal8Bit().constData(), 0, 0) < 0) return; av_find_stream_info(m_in); av_read_play(m_in); @@ -54,11 +54,7 @@ QHash<QString, QString> FFmpegMetaDataModel::audioProperties() for (wma_idx = 0; wma_idx < m_in->nb_streams; wma_idx++) { c = m_in->streams[wma_idx]->codec; -#if LIBAVCODEC_VERSION_MAJOR < 53 - if (c->codec_type == CODEC_TYPE_AUDIO) -#else if (c->codec_type == AVMEDIA_TYPE_AUDIO) -#endif break; } if (c) |