highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc/libdavs2: fix error return codes

Browse Source 
Signed-off-by: hwren <hwrenx@126.com>
This commit is contained in:
hwren
2018-09-12 13:53:08 +08:00
committed by Mark Thompson
parent 6f23c327c5
commit c0e9824c0f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/libdavs2.c
View File

@@ -50,7 +50,7 @@ static av_cold int davs2_init(AVCodecContext *avctx)
if (!cad->decoder) { if (!cad->decoder) {
av_log(avctx, AV_LOG_ERROR, "decoder created error."); 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); 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]){ if (!frame->buf[plane]){
av_log(avctx, AV_LOG_ERROR, "dump error: alloc failed.\n"); av_log(avctx, AV_LOG_ERROR, "dump error: alloc failed.\n");
return AVERROR(EINVAL); return AVERROR(ENOMEM);
} }
frame->data[plane] = frame->buf[plane]->data; frame->data[plane] = frame->buf[plane]->data;
@@ -142,7 +142,7 @@ static int davs2_decode_frame(AVCodecContext *avctx, void *data,
if (ret == DAVS2_ERROR) { if (ret == DAVS2_ERROR) {
av_log(avctx, AV_LOG_ERROR, "Decoder error: can't read packet\n"); 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); ret = davs2_decoder_recv_frame(cad->decoder, &cad->headerset, &cad->out_frame);