diff options
Diffstat (limited to 'sci-electronics/gazebo/files/ffmpeg6.patch')
-rw-r--r-- | sci-electronics/gazebo/files/ffmpeg6.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/sci-electronics/gazebo/files/ffmpeg6.patch b/sci-electronics/gazebo/files/ffmpeg6.patch deleted file mode 100644 index 932d1e31c9d1..000000000000 --- a/sci-electronics/gazebo/files/ffmpeg6.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: gazebo-11.12.0/gazebo/common/AudioDecoder.cc -=================================================================== ---- gazebo-11.12.0.orig/gazebo/common/AudioDecoder.cc -+++ gazebo-11.12.0/gazebo/common/AudioDecoder.cc -@@ -364,6 +364,7 @@ bool AudioDecoder::SetFile(const std::st - return false; - } - -+#if LIBAVCODEC_VERSION_MAJOR < 60 - #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 60, 100) - if (this->codec->capabilities & AV_CODEC_CAP_TRUNCATED) - this->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED; -@@ -371,6 +372,7 @@ bool AudioDecoder::SetFile(const std::st - if (this->codec->capabilities & CODEC_CAP_TRUNCATED) - this->codecCtx->flags |= CODEC_FLAG_TRUNCATED; - #endif -+#endif - - // Open codec - if (avcodec_open2(this->codecCtx, this->codec, nullptr) < 0) -Index: gazebo-11.12.0/gazebo/common/Video.cc -=================================================================== ---- gazebo-11.12.0.orig/gazebo/common/Video.cc -+++ gazebo-11.12.0/gazebo/common/Video.cc -@@ -214,6 +214,7 @@ bool Video::Load(const std::string &_fil - return false; - } - -+#if LIBAVCODEC_VERSION_MAJOR < 60 - // Inform the codec that we can handle truncated bitstreams -- i.e., - // bitstreams where frame boundaries can fall in the middle of packets - #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 60, 100) -@@ -223,6 +224,7 @@ bool Video::Load(const std::string &_fil - if (codec->capabilities & CODEC_CAP_TRUNCATED) - this->codecCtx->flags |= CODEC_FLAG_TRUNCATED; - #endif -+#endif - - // Open codec - if (avcodec_open2(this->codecCtx, codec, nullptr) < 0) |