diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2016-02-16 08:24:13 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2016-02-16 08:24:13 +0000 |
| commit | 2556a656cc812149d4b3617c64cfaf0a2f529392 (patch) | |
| tree | 1ed87a388494ace4a04483a7251b9693253bfc1b | |
| parent | f70660b8a1137d13b139b3d54d6d767d7fddfdd8 (diff) | |
| download | qmmp-2556a656cc812149d4b3617c64cfaf0a2f529392.tar.gz qmmp-2556a656cc812149d4b3617c64cfaf0a2f529392.tar.bz2 qmmp-2556a656cc812149d4b3617c64cfaf0a2f529392.zip | |
fixed previous commit
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6135 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index b2343242a..48e43f760 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -91,10 +91,10 @@ DecoderFFmpeg::~DecoderFFmpeg() if (ic) avformat_free_context(ic); if(m_pkt.data) -#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(104<<8)+102)) //ffmpeg-3.0 - av_free_packet(&m_pkt); -#else +#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(24<<8)+102)) //ffmpeg-3.0 av_packet_unref(&m_pkt); +#else + av_free_packet(&m_pkt); #endif if(m_stream) av_free(m_stream); @@ -380,10 +380,10 @@ qint64 DecoderFFmpeg::ffmpeg_decode() m_temp_pkt.size -= l; } if (!m_temp_pkt.size && m_pkt.data) -#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(104<<8)+102)) //ffmpeg-3.0 - av_free_packet(&m_pkt); -#else +#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(24<<8)+102)) //ffmpeg-3.0 av_packet_unref(&m_pkt); +#else + av_free_packet(&m_pkt); #endif return out_size; @@ -397,10 +397,10 @@ void DecoderFFmpeg::seek(qint64 pos) m_seekTime = timestamp; av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD); avcodec_flush_buffers(c); -#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(104<<8)+102)) //ffmpeg-3.0 - av_free_packet(&m_pkt); +#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(24<<8)+102)) //ffmpeg-3.0 + av_packet_unref(&m_pkt); #else - av_packet_unref(&m_pkt); + av_free_packet(&m_pkt); #endif m_temp_pkt.size = 0; } @@ -422,10 +422,10 @@ void DecoderFFmpeg::fillBuffer() if(m_pkt.stream_index != wma_idx) { if(m_pkt.data) -#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(104<<8)+102)) //ffmpeg-3.0 - av_free_packet(&m_pkt); -#else +#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(24<<8)+102)) //ffmpeg-3.0 av_packet_unref(&m_pkt); +#else + av_free_packet(&m_pkt); #endif m_temp_pkt.size = 0; continue; @@ -496,10 +496,10 @@ void DecoderFFmpeg::fillBuffer() #endif { if(m_pkt.data) -#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(104<<8)+102)) //ffmpeg-3.0 - av_free_packet(&m_pkt); -#else +#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(24<<8)+102)) //ffmpeg-3.0 av_packet_unref(&m_pkt); +#else + av_free_packet(&m_pkt); #endif m_pkt.data = 0; m_temp_pkt.size = 0; @@ -510,10 +510,10 @@ void DecoderFFmpeg::fillBuffer() else if(m_output_at == 0) { if(m_pkt.data) -#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(104<<8)+102)) //ffmpeg-3.0 - av_free_packet(&m_pkt); -#else +#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(24<<8)+102)) //ffmpeg-3.0 av_packet_unref(&m_pkt); +#else + av_free_packet(&m_pkt); #endif m_pkt.data = 0; m_temp_pkt.size = 0; |