Merge pull request #9861 from HiassofT/le13-ffmpeg-2025-03-10

ffmpeg: update rpi patch
This commit is contained in:
CvH 2025-03-11 17:21:22 +01:00 committed by GitHub
commit dd674e2adf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -19597,7 +19597,7 @@ index 000000000000..d8126676ee0c
+#endif // AVUTIL_ARM_SAND_NEON_H +#endif // AVUTIL_ARM_SAND_NEON_H
+ +
diff --git a/libavutil/frame.c b/libavutil/frame.c diff --git a/libavutil/frame.c b/libavutil/frame.c
index f0a0dba018a6..cc14af82d600 100644 index f0a0dba018a6..38458696c6ae 100644
--- a/libavutil/frame.c --- a/libavutil/frame.c
+++ b/libavutil/frame.c +++ b/libavutil/frame.c
@@ -16,6 +16,8 @@ @@ -16,6 +16,8 @@
@ -19619,14 +19619,13 @@ index f0a0dba018a6..cc14af82d600 100644
static const AVSideDataDescriptor sd_props[] = { static const AVSideDataDescriptor sd_props[] = {
[AV_FRAME_DATA_PANSCAN] = { "AVPanScan" }, [AV_FRAME_DATA_PANSCAN] = { "AVPanScan" },
@@ -1077,6 +1082,13 @@ int av_frame_apply_cropping(AVFrame *frame, int flags) @@ -1077,6 +1082,12 @@ int av_frame_apply_cropping(AVFrame *frame, int flags)
(frame->crop_top + frame->crop_bottom) >= frame->height) (frame->crop_top + frame->crop_bottom) >= frame->height)
return AVERROR(ERANGE); return AVERROR(ERANGE);
+#if CONFIG_SAND +#if CONFIG_SAND
+ // Sand cannot be cropped - do not try + // Sand cannot be cropped - do not try
+ // If it might be encapsulated in DRM_PRIME don't crop that either + if (av_rpi_is_sand_format(frame->format))
+ if (av_rpi_is_sand_format(frame->format) || frame->format == AV_PIX_FMT_DRM_PRIME)
+ return 0; + return 0;
+#endif +#endif
+ +