virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

mpegvideo: check return value of ff_MPV_common_init()

Browse Source 
Fixes CID703621
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-10-13 23:48:00 +02:00
parent 8cda27b753
commit f4d73f0fb5
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mpegvideo.c
View File

@@ -530,6 +530,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst,
const AVCodecContext *src) const AVCodecContext *src)
{ {
int i; int i;
int err;
MpegEncContext *s = dst->priv_data, *s1 = src->priv_data; MpegEncContext *s = dst->priv_data, *s1 = src->priv_data;
if (dst == src) if (dst == src)
@@ -547,12 +548,12 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst,
if (s1->context_initialized){ if (s1->context_initialized){
s->picture_range_start += MAX_PICTURE_COUNT; s->picture_range_start += MAX_PICTURE_COUNT;
s->picture_range_end += MAX_PICTURE_COUNT; s->picture_range_end += MAX_PICTURE_COUNT;
ff_MPV_common_init(s); if((err = ff_MPV_common_init(s)) < 0)
return err;
} }
} }
if (s->height != s1->height || s->width != s1->width || s->context_reinit) { if (s->height != s1->height || s->width != s1->width || s->context_reinit) {
int err;
s->context_reinit = 0; s->context_reinit = 0;
s->height = s1->height; s->height = s1->height;
s->width = s1->width; s->width = s1->width;