diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-06 23:59:35 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-06 23:59:35 +0100 |
commit | 7b018e5c8d182b0272477322377b8daafa1c970f (patch) | |
tree | 8f526f00d6352279d84ff8c7bcfbb2f78f702bd1 /libavcodec/xan.c | |
parent | 61904467458b16cf89530e2d0875f3786001dc11 (diff) | |
parent | 84f2847de394ac447f53306bd4dd73e1af6ea5e4 (diff) | |
download | ffmpeg-streaming-7b018e5c8d182b0272477322377b8daafa1c970f.zip ffmpeg-streaming-7b018e5c8d182b0272477322377b8daafa1c970f.tar.gz |
Merge commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4'
* commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4':
xl: return a meaningful error code.
xan: return a meaningful error code.
xxan: return meaningful error codes.
zmbv: return more meaningful error codes.
yop: use a meaningful error code.
c93: return meaningful error codes.
bmv: return meaningful error codes.
bmp: return meaningful error codes.
bink: operate with pointers to AVFrames instead of whole structs.
bink: return meaningful error codes.
bfi: return meaningful error codes.
bethsoftvideo: return meaningful error codes.
Conflicts:
libavcodec/c93.c
libavcodec/xl.c
libavcodec/xxan.c
libavcodec/yop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xan.c')
-rw-r--r-- | libavcodec/xan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/xan.c b/libavcodec/xan.c index 899c1f1..3a559e9 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -116,7 +116,7 @@ static int xan_huffman_decode(unsigned char *dest, int dest_len, while (val != 0x16) { unsigned idx = val - 0x17 + get_bits1(&gb) * byte; if (idx >= 2 * byte) - return -1; + return AVERROR_INVALIDDATA; val = src[idx]; if (val < 0x16) { |