diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-07 13:00:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 18:40:33 +0200 |
| commit | fd6230e8f0d2111249240bb0eeab084a9550bd8e (patch) | |
| tree | 8dcb78ca7a48ffd9b06a5cc04e1576a3b9c46bfc /libavcodec | |
| parent | 9406d3c910bfb8476c7bb9b942ef15785d0a309c (diff) | |
| download | ffmpeg-fd6230e8f0d2111249240bb0eeab084a9550bd8e.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>
(cherry picked from commit 0d0f7f0ba43f64312ae4a05d97afecf1b7b1330c)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 6668ffb2b2..88af957162 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1368,6 +1368,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]); |