diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-02 01:55:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-02 02:10:51 +0100 |
| commit | 043f32606046b1470218511ded151edfa7a126ee (patch) | |
| tree | 9172572ee754a2920269bc739953039cee876b64 | |
| parent | 9a641b909cb8132aeba0e112e5514b5e6f7b343d (diff) | |
| download | ffmpeg-043f32606046b1470218511ded151edfa7a126ee.tar.gz | |
avcodec/h264_slice: Clear table pointers to avoid stale pointersn2.4.3
Might fix Ticket3889
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 547fce95858ef83f8c25ae347e3ae3b8ba437fd9)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_slice.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index ffb7de5237..c46cc2453c 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -585,6 +585,17 @@ int ff_h264_update_thread_context(AVCodecContext *dst, h->mb_type_pool = NULL; h->ref_index_pool = NULL; h->motion_val_pool = NULL; + h->intra4x4_pred_mode= NULL; + h->non_zero_count = NULL; + h->slice_table_base = NULL; + h->slice_table = NULL; + h->cbp_table = NULL; + h->chroma_pred_mode_table = NULL; + memset(h->mvd_table, 0, sizeof(h->mvd_table)); + h->direct_table = NULL; + h->list_counts = NULL; + h->mb2b_xy = NULL; + h->mb2br_xy = NULL; for (i = 0; i < 2; i++) { h->rbsp_buffer[i] = NULL; h->rbsp_buffer_size[i] = 0; |