aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/qdrw.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-11-19 10:38:03 +0100
committerAnton Khirnov <anton@khirnov.net>2013-01-14 11:37:43 +0100
commit688b132b881d423877e38dc82f17e23a604be676 (patch)
tree1e2ca96c3ba85cf7db24addc38b09fa4eef36112 /libavcodec/qdrw.c
parent8f17829455308c9c988149d9c895913bf9e8af60 (diff)
downloadffmpeg-688b132b881d423877e38dc82f17e23a604be676.tar.gz
qdrw: return meaningful error codes.
Diffstat (limited to 'libavcodec/qdrw.c')
-rw-r--r--libavcodec/qdrw.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c
index ca982f340d..e7337a5766 100644
--- a/libavcodec/qdrw.c
+++ b/libavcodec/qdrw.c
@@ -45,7 +45,7 @@ static int decode_frame(AVCodecContext *avctx,
AVFrame * const p = &a->pic;
uint8_t* outdata;
int colors;
- int i;
+ int i, ret;
uint32_t *pal;
int r, g, b;
@@ -53,9 +53,9 @@ static int decode_frame(AVCodecContext *avctx,
avctx->release_buffer(avctx, p);
p->reference= 0;
- if(ff_get_buffer(avctx, p) < 0){
+ if ((ret = ff_get_buffer(avctx, p)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
}
p->pict_type= AV_PICTURE_TYPE_I;
p->key_frame= 1;
@@ -70,7 +70,7 @@ static int decode_frame(AVCodecContext *avctx,
if(colors < 0 || colors > 256) {
av_log(avctx, AV_LOG_ERROR, "Error color count - %i(0x%X)\n", colors, colors);
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (buf_end - buf < (colors + 1) * 8)
return AVERROR_INVALIDDATA;