[FFmpeg-devel] [PATCH 18/39] avcodec/libxavs: Improve returned error codes

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Fri May 21 12:17:21 EEST 2021


Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
 libavcodec/libxavs.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c
index ea53c49d38..88f674de40 100644
--- a/libavcodec/libxavs.c
+++ b/libavcodec/libxavs.c
@@ -112,7 +112,7 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt,
         int size = p_end - p;
         s = xavs_nal_encode(p, &size, 1, nals + i);
         if (s < 0)
-            return -1;
+            return AVERROR_EXTERNAL;
         if (s != 3U + nals[i].i_payload)
             return AVERROR_BUG;
         p += s;
@@ -146,12 +146,12 @@ static int XAVS_frame(AVCodecContext *avctx, AVPacket *pkt,
 
     if (xavs_encoder_encode(x4->enc, &nal, &nnal,
                             frame? &x4->pic: NULL, &pic_out) < 0)
-    return -1;
+        return AVERROR_EXTERNAL;
 
     ret = encode_nals(avctx, pkt, nal, nnal);
 
     if (ret < 0)
-        return -1;
+        return ret;
 
     if (!ret) {
         if (!frame && !(x4->end_of_stream)) {
@@ -345,7 +345,7 @@ static av_cold int XAVS_init(AVCodecContext *avctx)
 
     x4->enc = xavs_encoder_open(&x4->params);
     if (!x4->enc)
-        return -1;
+        return AVERROR_EXTERNAL;
 
     if (!(x4->pts_buffer = av_mallocz_array((avctx->max_b_frames+1), sizeof(*x4->pts_buffer))))
         return AVERROR(ENOMEM);
-- 
2.27.0



More information about the ffmpeg-devel mailing list