[FFmpeg-cvslog] lavc/libdavs2: fix error return codes

hwren git at videolan.org
Tue Sep 18 01:21:03 EEST 2018


ffmpeg | branch: master | hwren <hwrenx at 126.com> | Wed Sep 12 13:53:08 2018 +0800| [c0e9824c0f250aa993f1f189dbd75e2a89924325] | committer: Mark Thompson

lavc/libdavs2: fix error return codes

Signed-off-by: hwren <hwrenx at 126.com>

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

 libavcodec/libdavs2.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c
index ab9e5116c3..aa1478290a 100644
--- a/libavcodec/libdavs2.c
+++ b/libavcodec/libdavs2.c
@@ -50,7 +50,7 @@ static av_cold int davs2_init(AVCodecContext *avctx)
 
     if (!cad->decoder) {
         av_log(avctx, AV_LOG_ERROR, "decoder created error.");
-        return AVERROR(EINVAL);
+        return AVERROR_EXTERNAL;
     }
 
     av_log(avctx, AV_LOG_VERBOSE, "decoder created. %p\n", cad->decoder);
@@ -84,7 +84,7 @@ static int davs2_dump_frames(AVCodecContext *avctx, davs2_picture_t *pic,
 
         if (!frame->buf[plane]){
             av_log(avctx, AV_LOG_ERROR, "dump error: alloc failed.\n");
-            return AVERROR(EINVAL);
+            return AVERROR(ENOMEM);
         }
 
         frame->data[plane]     = frame->buf[plane]->data;
@@ -142,7 +142,7 @@ static int davs2_decode_frame(AVCodecContext *avctx, void *data,
 
     if (ret == DAVS2_ERROR) {
         av_log(avctx, AV_LOG_ERROR, "Decoder error: can't read packet\n");
-        return AVERROR(EINVAL);
+        return AVERROR_EXTERNAL;
     }
 
     ret = davs2_decoder_recv_frame(cad->decoder, &cad->headerset, &cad->out_frame);



More information about the ffmpeg-cvslog mailing list