Merge commit 'e568db40258d549777ac1c16971678e18a18f5f5'

[ffmpeg] / libavcodec / xxan.c

diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c
index ed1821772f53a142b1c3bd3df24c6ed66bc9eb6f..3476dcca3192b41ae0717bbb67d289a4204f33dd 100644 (file)
--- a/libavcodec/xxan.c
+++ b/libavcodec/xxan.c
@@ -186,7 +186,7 @@ static int xan_decode_chroma(AVCodecContext *avctx, unsigned chroma_off)
     dec_size = xan_unpack(s, s->scratch_buffer, s->buffer_size);
     if (dec_size < 0) {
         av_log(avctx, AV_LOG_ERROR, "Chroma unpacking failed\n");
-        return AVERROR_INVALIDDATA;
+        return dec_size;
     }
 
     U = s->pic.data[1];