diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-07 13:00:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-07 13:26:22 +0200 |
| commit | 0d0f7f0ba43f64312ae4a05d97afecf1b7b1330c (patch) | |
| tree | 0000300b35c7facac8e7197a556288142dcc6a5f /libavcodec/mpegvideo.c | |
| parent | 2762323c37511fbbc98b164c07620b9ebc59ec68 (diff) | |
| download | ffmpeg-0d0f7f0ba43f64312ae4a05d97afecf1b7b1330c.tar.gz | |
avcodec/mpegvideo: check that the context is initialized in ff_mpv_common_frame_size_change()
The function otherwise would initialize the context without setting context_initialized
alternatively we could set context_initialized
Fixes valgrind anomalies related to ticket 3928
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 7ae4e3580b..613a92e455 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1456,6 +1456,9 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s) { int i, err = 0; + if (!s->context_initialized) + return AVERROR(EINVAL); + if (s->slice_context_count > 1) { for (i = 0; i < s->slice_context_count; i++) { free_duplicate_context(s->thread_context[i]); |