diff options
| author | fritsch <Peter.Fruehberger@gmail.com> | 2016-03-29 18:36:02 +0200 |
|---|---|---|
| committer | fritsch <Peter.Fruehberger@gmail.com> | 2016-03-31 10:50:58 +0200 |
| commit | 37743813f5f6beaf36c06b56ddbea07d74b72936 (patch) | |
| tree | 56a43f3598cfb593ef5243a369f6472a86bbebda | |
| parent | d44c30e78e97e09436af77a44815bbe4f01cb9e3 (diff) | |
FFmpeg 3.0 Transition: Use av_packet_unref instead of av_free_packet
| -rw-r--r-- | xbmc/cdrip/EncoderFFmpeg.cpp | 2 | ||||
| -rw-r--r-- | xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp | 2 | ||||
| -rw-r--r-- | xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 12 | ||||
| -rw-r--r-- | xbmc/guilib/FFmpegImage.cpp | 2 | ||||
| -rw-r--r-- | xbmc/video/FFmpegVideoDecoder.cpp | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/xbmc/cdrip/EncoderFFmpeg.cpp b/xbmc/cdrip/EncoderFFmpeg.cpp index c4bf8a4d2e..bdd28db781 100644 --- a/xbmc/cdrip/EncoderFFmpeg.cpp +++ b/xbmc/cdrip/EncoderFFmpeg.cpp @@ -322,7 +322,7 @@ bool CEncoderFFmpeg::WriteFrame() } } - av_free_packet(&m_Pkt); + av_packet_unref(&m_Pkt); return true; } diff --git a/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp b/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp index 8f24a5d4fd..90474a550f 100644 --- a/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp +++ b/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp @@ -296,7 +296,7 @@ int CAEEncoderFFmpeg::Encode(uint8_t *in, int in_size, uint8_t *out, int out_siz int size = m_Pkt.size; /* free the packet */ - av_free_packet(&m_Pkt); + av_packet_unref(&m_Pkt); /* return the number of frames used */ return size; diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp index e2a99f35c6..7f5e8a7130 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -508,7 +508,7 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein void CDVDDemuxFFmpeg::Dispose() { m_pkt.result = -1; - av_free_packet(&m_pkt.pkt); + av_packet_unref(&m_pkt.pkt); if (m_pFormatContext) { @@ -556,7 +556,7 @@ void CDVDDemuxFFmpeg::Flush() m_currentPts = DVD_NOPTS_VALUE; m_pkt.result = -1; - av_free_packet(&m_pkt.pkt); + av_packet_unref(&m_pkt.pkt); m_displayTime = 0; m_dtsAtDisplayTime = DVD_NOPTS_VALUE; @@ -763,7 +763,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() CLog::Log(LOGERROR, "CDVDDemuxFFmpeg::Read() returned invalid packet and eof reached"); m_pkt.result = -1; - av_free_packet(&m_pkt.pkt); + av_packet_unref(&m_pkt.pkt); } else { @@ -887,7 +887,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() pPacket->iStreamId = m_pkt.pkt.stream_index; } m_pkt.result = -1; - av_free_packet(&m_pkt.pkt); + av_packet_unref(&m_pkt.pkt); } } } // end of lock scope @@ -949,7 +949,7 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) time = 0; m_pkt.result = -1; - av_free_packet(&m_pkt.pkt); + av_packet_unref(&m_pkt.pkt); CDVDInputStream::IPosTime* ist = m_pInput->GetIPosTime(); if (ist) @@ -1016,7 +1016,7 @@ bool CDVDDemuxFFmpeg::SeekByte(int64_t pos) UpdateCurrentPTS(); m_pkt.result = -1; - av_free_packet(&m_pkt.pkt); + av_packet_unref(&m_pkt.pkt); return (ret >= 0); } diff --git a/xbmc/guilib/FFmpegImage.cpp b/xbmc/guilib/FFmpegImage.cpp index 9e7b77d7f5..a37ffc39a4 100644 --- a/xbmc/guilib/FFmpegImage.cpp +++ b/xbmc/guilib/FFmpegImage.cpp @@ -327,7 +327,7 @@ AVFrame* CFFmpegImage::ExtractFrame() } av_frame_free(&frame); - av_free_packet(&pkt); + av_packet_unref(&pkt); return clone; } diff --git a/xbmc/video/FFmpegVideoDecoder.cpp b/xbmc/video/FFmpegVideoDecoder.cpp index 3fd8b47b93..402d538dca 100644 --- a/xbmc/video/FFmpegVideoDecoder.cpp +++ b/xbmc/video/FFmpegVideoDecoder.cpp @@ -282,7 +282,7 @@ bool FFmpegVideoDecoder::nextFrame( CBaseTexture * texture ) } } - av_free_packet( &packet ); + av_packet_unref( &packet ); } // We got the video frame, render it into the picture buffer @@ -292,7 +292,7 @@ bool FFmpegVideoDecoder::nextFrame( CBaseTexture * texture ) sws_scale( context, m_pFrame->data, m_pFrame->linesize, 0, m_pCodecCtx->height, m_pFrameRGB->data, m_pFrameRGB->linesize ); sws_freeContext( context ); - av_free_packet( &packet ); + av_packet_unref( &packet ); // And into the texture texture->Update( m_frameRGBwidth, m_frameRGBheight, m_frameRGBwidth * 4, XB_FMT_A8R8G8B8, m_pFrameRGB->data[0], false ); |