summaryrefslogtreecommitdiff
path: root/libavcodec/brenderpix.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-27 22:07:49 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-27 22:07:49 +0100
commita4f27a3f579b0114a58943b5466042ee83ed53b7 (patch)
tree448463135f2294550373324ac69b70bf584874f1 /libavcodec/brenderpix.c
parent85064233182913f7120bf63f0802add1c42971af (diff)
avcodec/brenderpix: propagate error codes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/brenderpix.c')
-rw-r--r--libavcodec/brenderpix.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/brenderpix.c b/libavcodec/brenderpix.c
index 370ee73dbc..e0d033fcf9 100644
--- a/libavcodec/brenderpix.c
+++ b/libavcodec/brenderpix.c
@@ -169,7 +169,7 @@ static int pix_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
ret = pix_decode_header(&hdr, &gb);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid header length.\n");
- return AVERROR_INVALIDDATA;
+ return ret;
}
switch (hdr.format) {
case 3:
@@ -223,7 +223,7 @@ static int pix_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
ret = pix_decode_header(&palhdr, &gb);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid palette header length.\n");
- return AVERROR_INVALIDDATA;
+ return ret;
}
if (palhdr.format != 7)
avpriv_request_sample(avctx, "Palette not in RGB format");