jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch
View File

@ -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
+