virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/mpegvideo: Set err on failure in ff_mpv_common_frame_size_change()

Browse Source 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-09-07 14:14:52 +02:00
parent 0d0f7f0ba4
commit cfce6f7efd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpegvideo.c
View File

@@ -1487,7 +1487,7 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s)
s->mb_height = (s->height + 15) / 16; s->mb_height = (s->height + 15) / 16;
if ((s->width || s->height) && 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; goto fail;
if ((err = init_context_frame(s))) if ((err = init_context_frame(s)))
@@ -1504,7 +1504,7 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s)
} }
for (i = 0; i < nb_slices; i++) { for (i = 0; i < nb_slices; i++) {
if (init_duplicate_context(s->thread_context[i]) < 0) if ((err = init_duplicate_context(s->thread_context[i])) < 0)
goto fail; goto fail;
s->thread_context[i]->start_mb_y = s->thread_context[i]->start_mb_y =
(s->mb_height * (i) + nb_slices / 2) / nb_slices; (s->mb_height * (i) + nb_slices / 2) / nb_slices;