---
libavcodec/vc1dec.c | 8 +++++---
libavcodec/wmv2dec.c | 4 +---
2 files changed, 6 insertions(+), 6 deletions(-)
Unchanged.
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 51f5c42..76f3591 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -314,7 +314,7 @@ static void vc1_sprite_flush(AVCodecContext *avctx)
av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
{
MpegEncContext *s = &v->s;
- int i;
+ int i, ret = AVERROR(ENOMEM);
int mb_height = FFALIGN(s->mb_height, 2);
/* Allocate mb bitplanes */
@@ -371,7 +371,9 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
v->mv_f_next[0] = v->mv_f_next_base + s->b8_stride + 1;
v->mv_f_next[1] = v->mv_f_next[0] + (s->b8_stride * (mb_height * 2 +
1) + s->mb_stride * (mb_height + 1) * 2);
- ff_intrax8_common_init(&v->x8,s);
+ ret = ff_intrax8_common_init(&v->x8,s);
+ if (ret < 0)
+ goto error;
if (s->avctx->codec_id == AV_CODEC_ID_WMV3IMAGE || s->avctx->codec_id ==
AV_CODEC_ID_VC1IMAGE) {
for (i = 0; i < 4; i++) {
@@ -385,7 +387,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
error:
ff_vc1_decode_end(s->avctx);
- return AVERROR(ENOMEM);
+ return ret;
}
av_cold void ff_vc1_init_transposed_scantables(VC1Context *v)
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index ca8afe6..5bfedbd 100644
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -471,9 +471,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)
--
2.7.3
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
