diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
| commit | 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a (patch) | |
| tree | 15d339b62e98d5858a57aa787334e14f0e2f0ad7 /src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | |
| parent | 6fc05db7c6de9a51beba754f12ff4ac32859977d (diff) | |
| download | qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.gz qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.bz2 qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.zip | |
copy 1.2 branch to trunk
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp')
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index 9a3f088ad..524273d23 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -270,13 +270,8 @@ bool DecoderFFmpeg::initialize() m_totalTime = input()->isSequential() ? 0 : ic->duration * 1000 / AV_TIME_BASE; -#if (LIBAVCODEC_VERSION_INT >= ((55<<16)+(34<<8)+0)) //libav 10 if(c->codec_id == AV_CODEC_ID_SHORTEN) //ffmpeg bug workaround m_totalTime = 0; -#else - if(c->codec_id == CODEC_ID_SHORTEN) //ffmpeg bug workaround - m_totalTime = 0; -#endif Qmmp::AudioFormat format = Qmmp::PCM_UNKNOWM; @@ -467,11 +462,8 @@ void DecoderFFmpeg::fillBuffer() m_temp_pkt.size = 0; continue; } -#if (LIBAVCODEC_VERSION_INT >= ((55<<16)+(34<<8)+0)) //libav 10 + if(m_seekTime && c->codec_id == AV_CODEC_ID_APE) -#else - if(m_seekTime && c->codec_id == CODEC_ID_APE) -#endif { int64_t rescaledPts = av_rescale(m_pkt.pts, AV_TIME_BASE * (int64_t) @@ -481,11 +473,8 @@ void DecoderFFmpeg::fillBuffer() } m_seekTime = 0; } -#if (LIBAVCODEC_VERSION_INT >= ((55<<16)+(34<<8)+0)) //libav 10 + if(m_skipBytes > 0 && c->codec_id == AV_CODEC_ID_APE) -#else - if(m_skipBytes > 0 && c->codec_id == CODEC_ID_APE) -#endif { while (m_skipBytes > 0) { @@ -524,11 +513,7 @@ void DecoderFFmpeg::fillBuffer() m_output_at = 0; m_temp_pkt.size = 0; -#if (LIBAVCODEC_VERSION_INT >= ((55<<16)+(34<<8)+0)) //libav 10 if(c->codec_id == AV_CODEC_ID_SHORTEN || c->codec_id == AV_CODEC_ID_TWINVQ) -#else - if(c->codec_id == CODEC_ID_SHORTEN || c->codec_id == CODEC_ID_TWINVQ) -#endif { if(m_pkt.data) #if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(24<<8)+102)) //ffmpeg-3.0 |