You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/sci-libs/ignition-common/files/ffmpeg6.patch

41 lines
1.7 KiB

Index: gz-common-ignition-common3_3.14.2/av/src/AudioDecoder.cc
===================================================================
--- gz-common-ignition-common3_3.14.2.orig/av/src/AudioDecoder.cc
+++ gz-common-ignition-common3_3.14.2/av/src/AudioDecoder.cc
@@ -348,6 +348,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->data->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
this->data->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED;
@@ -355,6 +356,7 @@ bool AudioDecoder::SetFile(const std::st
if (this->data->codec->capabilities & CODEC_CAP_TRUNCATED)
this->data->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
#endif
+#endif
// Open codec
if (avcodec_open2(this->data->codecCtx, this->data->codec, nullptr) < 0)
Index: gz-common-ignition-common3_3.14.2/av/src/Video.cc
===================================================================
--- gz-common-ignition-common3_3.14.2.orig/av/src/Video.cc
+++ gz-common-ignition-common3_3.14.2/av/src/Video.cc
@@ -179,6 +179,7 @@ bool Video::Load(const std::string &_fil
this->dataPtr->videoStream]->codec;
#endif
+#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)
@@ -188,6 +189,7 @@ bool Video::Load(const std::string &_fil
if (codec->capabilities & CODEC_CAP_TRUNCATED)
this->dataPtr->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
#endif
+#endif
// Open codec
if (avcodec_open2(this->dataPtr->codecCtx, codec, nullptr) < 0)