summaryrefslogtreecommitdiff
path: root/libavcodec/wmv2dec.c
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-17 19:32:26 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-17 19:32:26 +0100
commit61400a1dc751c82cf6f33a7510c3804b7b201f25 (patch)
treed1d1e0f627418472e93ede72627e07a356ac62cf /libavcodec/wmv2dec.c
parentf64b53f2bf5f3f43402564bf57a8555a709d012c (diff)
parentd909f43b5c773a73c8d526638744547ba4aa8c59 (diff)
downloadffmpeg-61400a1dc751c82cf6f33a7510c3804b7b201f25.tar.gz
Merge commit 'd909f43b5c773a73c8d526638744547ba4aa8c59'
* commit 'd909f43b5c773a73c8d526638744547ba4aa8c59': vc1dec: wmv2dec: Validate ff_intrax8_common_init return value Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/wmv2dec.c')
-rw-r--r--libavcodec/wmv2dec.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index 0c2f14d55a..934bf153ac 100644
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -466,9 +466,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx)
ff_wmv2_common_init(w);
- ff_intrax8_common_init(&w->x8, &w->s);
-
- return 0;
+ return ff_intrax8_common_init(&w->x8, &w->s);
}
static av_cold int wmv2_decode_end(AVCodecContext *avctx)