Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avutil/frame: check return value for cropping offsets

Browse source 
This function can return AVERROR_BUG in theory if something
went wrong, but so can the caller, so we should propagate that
error message upward in that case.

Signed-off-by: Leo Izen <leo.izen@gmail.com>
This commit is contained in:
Leo Izen 2025-01-21 07:15:44 -05:00
parent cadd9d54a4
commit eb5fc63deb
Signed by: Traneptora
GPG key ID: 764E48EA48221833
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libavutil/frame.c
View file

@ -1095,6 +1095,7 @@ int av_frame_apply_cropping(AVFrame *frame, int flags)
{ {
const AVPixFmtDescriptor *desc; const AVPixFmtDescriptor *desc;
size_t offsets[4]; size_t offsets[4];
int ret;
if (!(frame->width > 0 && frame->height > 0)) if (!(frame->width > 0 && frame->height > 0))
return AVERROR(EINVAL); return AVERROR(EINVAL);
@ -1122,7 +1123,9 @@ int av_frame_apply_cropping(AVFrame *frame, int flags)
} }
/* calculate the offsets for each plane */ /* calculate the offsets for each plane */
calc_cropping_offsets(offsets, frame, desc); ret = calc_cropping_offsets(offsets, frame, desc);
if (ret < 0)
return ret;
/* adjust the offsets to avoid breaking alignment */ /* adjust the offsets to avoid breaking alignment */
if (!(flags & AV_FRAME_CROP_UNALIGNED)) { if (!(flags & AV_FRAME_CROP_UNALIGNED)) {
@ -1141,7 +1144,9 @@ int av_frame_apply_cropping(AVFrame *frame, int flags)
if (min_log2_align < 5 && log2_crop_align != INT_MAX) { if (min_log2_align < 5 && log2_crop_align != INT_MAX) {
frame->crop_left &= ~((1 << (5 + log2_crop_align - min_log2_align)) - 1); frame->crop_left &= ~((1 << (5 + log2_crop_align - min_log2_align)) - 1);
calc_cropping_offsets(offsets, frame, desc); ret = calc_cropping_offsets(offsets, frame, desc);
if (ret < 0)
return ret;
} }
} }