hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 23:34:06 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Fix compilation with last FFMpeg versions (issue #673)

Browse source
This commit is contained in:
Abs62 2016-02-17 17:37:23 +03:00
parent 40e2895ee3
commit cabc5aa7c3
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ffmpegaudio.cc
View file

@ -334,7 +334,11 @@ void DecoderContext::closeOutputDevice()
bool DecoderContext::play( QString & errorString )
{
#if LIBAVCODEC_VERSION_MAJOR < 55 || ( LIBAVCODEC_VERSION_MAJOR == 55 && LIBAVCODEC_VERSION_MINOR < 28 )
AVFrame * frame = avcodec_alloc_frame();
#else
AVFrame * frame = av_frame_alloc();
#endif
if ( !frame )
{
errorString = QObject::tr( "avcodec_alloc_frame() failed." );
@ -365,7 +369,11 @@ bool DecoderContext::play( QString & errorString )
while( pack.size > 0 );
}
// av_free_packet() must be called after each call to av_read_frame()
#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
av_free_packet( &packet );
#else
av_packet_unref( &packet );
#endif
}
if ( !isCancelled_ && codecContext_->codec->capabilities & CODEC_CAP_DELAY )
@ -382,8 +390,10 @@ bool DecoderContext::play( QString & errorString )
#if LIBAVCODEC_VERSION_MAJOR < 54
av_free( frame );
#else
#elif LIBAVCODEC_VERSION_MAJOR < 55 || ( LIBAVCODEC_VERSION_MAJOR == 55 && LIBAVCODEC_VERSION_MINOR < 28 )
avcodec_free_frame( &frame );
#else
av_frame_free( &frame );
#endif
return true;