[FFmpeg-cvslog] avcodec/audiotoolboxenc: return AVERROR_EXTERNAL immediately when encode error

Steven Liu git at videolan.org
Wed Oct 5 18:21:42 EEST 2022


ffmpeg | branch: release/5.1 | Steven Liu <lq at chinaffmpeg.org> | Wed Jun 29 00:14:08 2022 +0800| [79bd6a21a04c7c457bfeb53fddc157bbd80cdaac] | committer: Steven Liu

avcodec/audiotoolboxenc: return AVERROR_EXTERNAL immediately when encode error

Just return AVERROR_EXTERNAL immediately when encode error.
The other logic should keep the old behavior before commit 7c05b7951.

Suggested-By: Zhao Zhili <zhilizhao at tencent.com>
Signed-off-by: Steven Liu <lq at chinaffmpeg.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=79bd6a21a04c7c457bfeb53fddc157bbd80cdaac
---

 libavcodec/audiotoolboxenc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c
index 00293154bf..8bbaabd960 100644
--- a/libavcodec/audiotoolboxenc.c
+++ b/libavcodec/audiotoolboxenc.c
@@ -554,13 +554,12 @@ static int ffat_encode(AVCodecContext *avctx, AVPacket *avpkt,
                                      avctx->frame_size,
                            &avpkt->pts,
                            &avpkt->duration);
-        ret = 0;
     } else if (ret && ret != 1) {
         av_log(avctx, AV_LOG_ERROR, "Encode error: %i\n", ret);
-        ret = AVERROR_EXTERNAL;
+        return AVERROR_EXTERNAL;
     }
 
-    return ret;
+    return 0;
 }
 
 static av_cold void ffat_encode_flush(AVCodecContext *avctx)



More information about the ffmpeg-cvslog mailing list