[FFmpeg-cvslog] avs: return meaningful error codes.
Anton Khirnov
git at videolan.org
Sun Jan 6 23:55:16 CET 2013
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Nov 14 16:09:39 2012 +0100| [e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355] | committer: Anton Khirnov
avs: return meaningful error codes.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355
---
libavcodec/avs.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavcodec/avs.c b/libavcodec/avs.c
index 98a53f2..71b8b0c 100644
--- a/libavcodec/avs.c
+++ b/libavcodec/avs.c
@@ -54,14 +54,14 @@ avs_decode_frame(AVCodecContext * avctx,
AVFrame *const p = &avs->picture;
const uint8_t *table, *vect;
uint8_t *out;
- int i, j, x, y, stride, vect_w = 3, vect_h = 3;
+ int i, j, x, y, stride, ret, vect_w = 3, vect_h = 3;
AvsVideoSubType sub_type;
AvsBlockType type;
GetBitContext change_map;
- if (avctx->reget_buffer(avctx, p)) {
+ if ((ret = avctx->reget_buffer(avctx, p)) < 0) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
}
p->reference = 1;
p->pict_type = AV_PICTURE_TYPE_P;
@@ -94,7 +94,7 @@ avs_decode_frame(AVCodecContext * avctx,
}
if (type != AVS_VIDEO)
- return -1;
+ return AVERROR_INVALIDDATA;
switch (sub_type) {
case AVS_I_FRAME:
@@ -116,7 +116,7 @@ avs_decode_frame(AVCodecContext * avctx,
break;
default:
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (buf_end - buf < 256 * vect_w * vect_h)
More information about the ffmpeg-cvslog
mailing list