diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-03 07:41:04 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-03 07:41:04 +0000 |
| commit | b917024aa1ac4cb0a40164132db3c6d2913157eb (patch) | |
| tree | 4424bef9f2ac9a3dab21c822836a1b5c79ffee47 /src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp | |
| parent | bef5a901922c002815d047d276e61ec0bf8c0f46 (diff) | |
| download | qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.tar.gz qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.tar.bz2 qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.zip | |
fixed build with -Werror=zero-as-null-pointer-constant
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8572 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp')
| -rw-r--r-- | src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp index d3b725744..17907d0cd 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp @@ -23,14 +23,14 @@ FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path) : MetaDataModel(true) { - m_in = 0; + m_in = nullptr; #ifdef Q_OS_WIN - if (avformat_open_input(&m_in, path.toUtf8().constData(), 0, 0) < 0) + if (avformat_open_input(&m_in, path.toUtf8().constData(), nullptr, nullptr) < 0) #else - if (avformat_open_input(&m_in, path.toLocal8Bit().constData(), 0, 0) < 0) + if (avformat_open_input(&m_in, path.toLocal8Bit().constData(), nullptr, nullptr) < 0) #endif return; - avformat_find_stream_info(m_in, 0); + avformat_find_stream_info(m_in, nullptr); av_read_play(m_in); } @@ -45,9 +45,9 @@ QPixmap FFmpegMetaDataModel::cover() const if(!m_in) return QPixmap(); #if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,48,0)) //ffmpeg-3.1: 57.48.101 - AVCodecParameters *c = 0; + AVCodecParameters *c = nullptr; #else - AVCodecContext *c = 0; + AVCodecContext *c = nullptr; #endif for (uint idx = 0; idx < m_in->nb_streams; idx++) |
