[FFmpeg-cvslog] avcodec/videotoolboxenc: fix error code
Zhao Zhili
git at videolan.org
Wed Jan 11 05:06:51 EET 2023
ffmpeg | branch: master | Zhao Zhili <zhilizhao at tencent.com> | Wed Jan 4 10:37:50 2023 +0800| [8f35ee824000ea039067aef0478b413ee4e78fa5] | committer: Zhao Zhili
avcodec/videotoolboxenc: fix error code
1. Fix return 0 on error.
2. Fix return OS error code passthrough.
Signed-off-by: Zhao Zhili <zhilizhao at tencent.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f35ee824000ea039067aef0478b413ee4e78fa5
---
libavcodec/videotoolboxenc.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index 3b00e542cb..56971471e4 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -2555,6 +2555,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
pool = VTCompressionSessionGetPixelBufferPool(vtctx->session);
if(!pool){
av_log(avctx, AV_LOG_ERROR, "Error getting pixel buffer pool.\n");
+ status = AVERROR_EXTERNAL;
goto pe_cleanup;
}
@@ -2564,6 +2565,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
if(status != kCVReturnSuccess){
av_log(avctx, AV_LOG_ERROR, "Error creating frame from pool: %d\n", status);
+ status = AVERROR_EXTERNAL;
goto pe_cleanup;
}
@@ -2581,7 +2583,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
AV_LOG_ERROR,
"Error sending frame for extradata: %d\n",
status);
-
+ status = AVERROR_EXTERNAL;
goto pe_cleanup;
}
@@ -2589,8 +2591,10 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
status = VTCompressionSessionCompleteFrames(vtctx->session,
kCMTimeIndefinite);
- if (status)
+ if (status) {
+ status = AVERROR_EXTERNAL;
goto pe_cleanup;
+ }
status = vtenc_q_pop(vtctx, 0, &buf, NULL);
if (status) {
More information about the ffmpeg-cvslog
mailing list