virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

avcodec/videotoolboxenc: improve Lock/Unlock BaseAddress error handling

Browse Source 
1. Fix continue after CVPixelBufferLockBaseAddress.
2. Remove redundant "Error: " in error message.
This commit is contained in:
Zhao Zhili
2025-11-18 12:46:13 +08:00
parent f283750ba8
commit 0da15c93c8
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/videotoolboxenc.c
View File

@@ -2414,12 +2414,8 @@ static int copy_avframe_to_pixel_buffer(AVCodecContext *avctx,
status = CVPixelBufferLockBaseAddress(cv_img, 0); status = CVPixelBufferLockBaseAddress(cv_img, 0);
if (status) { if (status) {
av_log( av_log(avctx, AV_LOG_ERROR, "Could not lock base address of CVPixelBuffer: %d.\n", status);
avctx, return AVERROR_EXTERNAL;
AV_LOG_ERROR,
"Error: Could not lock base address of CVPixelBuffer: %d.\n",
status
);
} }
if (CVPixelBufferIsPlanar(cv_img)) { if (CVPixelBufferIsPlanar(cv_img)) {
@@ -2481,7 +2477,7 @@ static int copy_avframe_to_pixel_buffer(AVCodecContext *avctx,
status = CVPixelBufferUnlockBaseAddress(cv_img, 0); status = CVPixelBufferUnlockBaseAddress(cv_img, 0);
if (status) { if (status) {
av_log(avctx, AV_LOG_ERROR, "Error: Could not unlock CVPixelBuffer base address: %d.\n", status); av_log(avctx, AV_LOG_ERROR, "Could not unlock CVPixelBuffer base address: %d.\n", status);
return AVERROR_EXTERNAL; return AVERROR_EXTERNAL;
} }