diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-07 14:14:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:40:03 +0100 |
| commit | 66b1f5894a1dccc3db849675c9eaef50cd06e50c (patch) | |
| tree | d1feb7d325664f527e855c6d24e1d72272ad62a7 | |
| parent | 91c3a829a4ed933dbf7be1adc9e47dae6a52762a (diff) | |
| download | ffmpeg-66b1f5894a1dccc3db849675c9eaef50cd06e50c.tar.gz | |
avcodec/mpegvideo: Set err on failure in ff_mpv_common_frame_size_change()
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cfce6f7efd28130bf0dd409b2367ca0f8c9b2417)
Conflicts:
libavcodec/mpegvideo.c
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 6035d5130e..b227415dc7 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1065,7 +1065,7 @@ int ff_MPV_common_frame_size_change(MpegEncContext *s) s->mb_height = (s->height + 15) / 16; if ((s->width || s->height) && - av_image_check_size(s->width, s->height, 0, s->avctx)) + (err = av_image_check_size(s->width, s->height, 0, s->avctx)) < 0) goto fail; if ((err = init_context_frame(s))) @@ -1082,7 +1082,7 @@ int ff_MPV_common_frame_size_change(MpegEncContext *s) } for (i = 0; i < nb_slices; i++) { - if (init_duplicate_context(s->thread_context[i], s) < 0) + if ((err = init_duplicate_context(s->thread_context[i], s)) < 0) goto fail; s->thread_context[i]->start_mb_y = (s->mb_height * (i) + nb_slices / 2) / nb_slices; |