From af105904a4255fe51335598b46b32f8b33c07438 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 10 Mar 2025 16:15:27 +0100 Subject: [PATCH] ffmpeg: update rpi patch Patch created using revisions b08d796..af10b2f from branch test/7.1/main of https://github.com/jc-kynesim/rpi-ffmpeg --- .../multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch b/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch index 82b59fea06..3fb4399560 100644 --- a/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch +++ b/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch @@ -19597,7 +19597,7 @@ index 000000000000..d8126676ee0c +#endif // AVUTIL_ARM_SAND_NEON_H + diff --git a/libavutil/frame.c b/libavutil/frame.c -index f0a0dba018a6..cc14af82d600 100644 +index f0a0dba018a6..38458696c6ae 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -16,6 +16,8 @@ @@ -19619,14 +19619,13 @@ index f0a0dba018a6..cc14af82d600 100644 static const AVSideDataDescriptor sd_props[] = { [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) return AVERROR(ERANGE); +#if CONFIG_SAND + // 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) || frame->format == AV_PIX_FMT_DRM_PRIME) ++ if (av_rpi_is_sand_format(frame->format)) + return 0; +#endif +