aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-11 01:58:36 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-13 16:10:09 +0100
commitaaaafc300df691a3b6f6f1a1837f772e81b04086 (patch)
tree54d2217d798a12509ba12497d244892b91c080d5
parent6da213ce208dabda3ce1d9e8d4fb72d337fa0b3f (diff)
downloadffmpeg-aaaafc300df691a3b6f6f1a1837f772e81b04086.tar.gz
avcodec/wmalosslessdec: Pass on error code from decode_tilehdr()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 03fff09b32171e0c76d104c02ebf578c7f4fe21d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/wmalosslessdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 7a80248ffc..6386930f39 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -1038,9 +1038,9 @@ static int decode_frame(WmallDecodeCtx *s)
len = get_bits(gb, s->log2_frame_size);
/* decode tile information */
- if (decode_tilehdr(s)) {
+ if ((ret = decode_tilehdr(s))) {
s->packet_loss = 1;
- return 0;
+ return ret;
}
/* read drc info */