[FFmpeg-cvslog] aasc: return meaningful error codes.
Anton Khirnov
git at videolan.org
Sun Jan 6 23:55:15 CET 2013
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Nov 14 09:11:07 2012 +0100| [18009e60d273eb2e0184926812778e06985bf48e] | committer: Anton Khirnov
aasc: return meaningful error codes.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18009e60d273eb2e0184926812778e06985bf48e
---
libavcodec/aasc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c
index 47d25d0..7759c71 100644
--- a/libavcodec/aasc.c
+++ b/libavcodec/aasc.c
@@ -56,13 +56,13 @@ static int aasc_decode_frame(AVCodecContext *avctx,
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
AascContext *s = avctx->priv_data;
- int compr, i, stride;
+ int compr, i, stride, ret;
s->frame.reference = 1;
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, &s->frame)) {
+ if ((ret = avctx->reget_buffer(avctx, &s->frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
}
compr = AV_RL32(buf);
@@ -82,7 +82,7 @@ static int aasc_decode_frame(AVCodecContext *avctx,
break;
default:
av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr);
- return -1;
+ return AVERROR_INVALIDDATA;
}
*got_frame = 1;
More information about the ffmpeg-cvslog
mailing list