1 files changed, 0 insertions, 167 deletions
diff --git a/office/goldendict/patches/goldendict-ffmpeg4.patch b/office/goldendict/patches/goldendict-ffmpeg4.patch
deleted file mode 100644
index 6e6d03675a..0000000000
--- a/office/goldendict/patches/goldendict-ffmpeg4.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
-From: Abs62 <ottomann@yandex.ru>
-Date: Fri, 30 Mar 2018 22:53:24 +0300
-Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
-
----
- ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 62 insertions(+), 6 deletions(-)
-
-diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
-index ed1172bd..56e8f788 100644
---- a/ffmpegaudio.cc
-+++ b/ffmpegaudio.cc
-@@ -91,6 +91,7 @@ struct DecoderContext
-   QByteArray audioData_;
-   QDataStream audioDataStream_;
-   AVFormatContext * formatContext_;
-+  AVCodec * codec_;
-   AVCodecContext * codecContext_;
-   AVIOContext * avioContext_;
-   AVStream * audioStream_;
-@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan
-   audioData_( audioData ),
-   audioDataStream_( audioData_ ),
-   formatContext_( NULL ),
-+  codec_( NULL ),
-   codecContext_( NULL ),
-   avioContext_( NULL ),
-   audioStream_( NULL ),
-@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
-     return false;
-   }
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 )
-   unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
-+#else
-+  unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
-+#endif
-   if ( !avioBuffer )
-   {
-     errorString = QObject::tr( "av_malloc() failed." );
-@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
-   // Find audio stream, use the first audio stream if available
-   for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
-   {
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
-     if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
-+#else
-+      if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
-+#endif
-     {
-       audioStream_ = formatContext_->streams[i];
-       break;
-@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
-     return false;
-   }
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
-   codecContext_ = audioStream_->codec;
--  AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
--  if ( !codec )
-+  codec_ = avcodec_find_decoder( codecContext_->codec_id );
-+  if ( !codec_ )
-   {
-     errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id );
-     return false;
-   }
-+#else
-+  codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
-+  if ( !codec_ )
-+  {
-+    errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
-+    return false;
-+  }
-+  codecContext_ = avcodec_alloc_context3( codec_ );
-+  if ( !codecContext_ )
-+  {
-+    errorString = QObject::tr( "avcodec_alloc_context3() failed." );
-+    return false;
-+  }
-+  avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
-+#endif
- 
--  ret = avcodec_open2( codecContext_, codec, NULL );
-+  ret = avcodec_open2( codecContext_, codec_, NULL );
-   if ( ret < 0 )
-   {
-     errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
-     return false;
-   }
- 
--  av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name,
-+  av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
-           codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
-   return true;
- }
-@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
- 
-   // Closing a codec context without prior avcodec_open2() will result in
-   // a crash in ffmpeg
--  if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
-+  if ( audioStream_ && codecContext_ && codec_ )
-   {
-     audioStream_->discard = AVDISCARD_ALL;
--    avcodec_close( audioStream_->codec );
-+    avcodec_close( codecContext_ );
-+#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 )
-+    avcodec_free_context( &codecContext_ );
-+#endif
-   }
- 
-   avformat_close_input( &formatContext_ );
-@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString )
-     if ( packet.stream_index == audioStream_->index )
-     {
-       AVPacket pack = packet;
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
-       int gotFrame = 0;
-       do
-       {
-@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString )
-         pack.data += len;
-       }
-       while( pack.size > 0 );
-+#else
-+      int ret = avcodec_send_packet( codecContext_, &pack );
-+      /* read all the output frames (in general there may be any number of them) */
-+      while( ret >= 0 )
-+      {
-+        ret = avcodec_receive_frame( codecContext_, frame);
-+
-+        if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
-+          break;
-+
-+        playFrame( frame );
-+      }
-+#endif
-     }
-     // 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 )
-@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString )
- #endif
-   }
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
-   if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
-        codecContext_->codec->capabilities & CODEC_CAP_DELAY )
-   {
-@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString )
-       playFrame( frame );
-     }
-   }
-+#else
-+  /* flush the decoder */
-+  av_init_packet( &packet );
-+  int ret = avcodec_send_packet(codecContext_, &packet );
-+  while( ret >= 0 )
-+  {
-+    ret = avcodec_receive_frame(codecContext_, frame);
-+    if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
-+      break;
-+    playFrame( frame );
-+  }
-+#endif
- 
- #if LIBAVCODEC_VERSION_MAJOR < 54
-   av_free( frame );