aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2011-10-11 11:55:56 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2011-10-28 11:47:27 -0400
commit91b71460b5b2ba1060314d5811029159a013fcac (patch)
tree845f504f2b4832daceb87d418517b28c4bb8851e
parentc6defb41ef78909e25cf7940ae1542775099f995 (diff)
downloadffmpeg-91b71460b5b2ba1060314d5811029159a013fcac.tar.gz
apedec: return meaningful error values in ape_decode_frame()
-rw-r--r--libavcodec/apedec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 9a15bfb872..a754fd75b0 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -820,7 +820,7 @@ static int ape_decode_frame(AVCodecContext *avctx,
/* should not happen but who knows */
if (BLOCKS_PER_LOOP * 2 * avctx->channels > *data_size) {
av_log (avctx, AV_LOG_ERROR, "Output buffer is too small.\n");
- return -1;
+ return AVERROR(EINVAL);
}
if(!s->samples){
@@ -834,7 +834,7 @@ static int ape_decode_frame(AVCodecContext *avctx,
if(n < 0 || n > 3){
av_log(avctx, AV_LOG_ERROR, "Incorrect offset passed\n");
s->data = NULL;
- return -1;
+ return AVERROR_INVALIDDATA;
}
s->ptr += n;
@@ -871,7 +871,7 @@ static int ape_decode_frame(AVCodecContext *avctx,
if(s->error || s->ptr > s->data_end){
s->samples=0;
av_log(avctx, AV_LOG_ERROR, "Error decoding frame\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
for (i = 0; i < blockstodecode; i++) {