diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-07 13:00:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:40:03 +0100 |
| commit | 91c3a829a4ed933dbf7be1adc9e47dae6a52762a (patch) | |
| tree | 2544e245f9169f1e1bb163077a5cf435e50b1e39 | |
| parent | a2933aa59a466ae4ca50c8f41a6a16bf7df35400 (diff) | |
| download | ffmpeg-91c3a829a4ed933dbf7be1adc9e47dae6a52762a.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>
| -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 37da6e5534..6035d5130e 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1034,6 +1034,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]); |