aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-02 21:45:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-02 21:45:58 +0200
commit50c6bffb67d140bcf4b28d0b4495648b9f6b07f9 (patch)
treecd4b9a89006063727d99cb8061e6b5cf64329603
parent098af260675b601c0a02a373b53ed21b77775f22 (diff)
parent74512f7e369da40e1148c92b58cd8e59f7737b8f (diff)
downloadffmpeg-50c6bffb67d140bcf4b28d0b4495648b9f6b07f9.tar.gz
Merge commit '74512f7e369da40e1148c92b58cd8e59f7737b8f'
* commit '74512f7e369da40e1148c92b58cd8e59f7737b8f': 8svx: Return proper error codes Conflicts: libavcodec/8svx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/8svx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c
index eff525c951..26496e506c 100644
--- a/libavcodec/8svx.c
+++ b/libavcodec/8svx.c
@@ -101,7 +101,7 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data,
}
if (avpkt->size < (hdr_size + 1) * avctx->channels) {
av_log(avctx, AV_LOG_ERROR, "packet size is too small\n");
- return AVERROR(EINVAL);
+ return AVERROR_INVALIDDATA;
}
esc->fib_acc[0] = avpkt->data[1] + 128;
@@ -124,7 +124,7 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data,
}
if (!esc->data[0]) {
av_log(avctx, AV_LOG_ERROR, "unexpected empty packet\n");
- return AVERROR(EINVAL);
+ return AVERROR_INVALIDDATA;
}
/* decode next piece of data from the buffer */