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:22:14 +0100 |
| commit | 25a9823eb44a9e77b3568c93751fb002ffb2ae48 (patch) | |
| tree | 7d6786950fa11713a8c230d7b785d145a55c98d1 | |
| parent | a8fd50bb4eeb0b159c46d51000b0d6a981748d9f (diff) | |
| download | ffmpeg-25a9823eb44a9e77b3568c93751fb002ffb2ae48.tar.gz | |
avcodec/h264_slice: Clear table pointers to avoid stale pointers
Might fix Ticket3889
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 547fce95858ef83f8c25ae347e3ae3b8ba437fd9)
Conflicts:
libavcodec/h264_slice.c
Conflicts:
libavcodec/h264.c
| -rw-r--r-- | libavcodec/h264.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 21fcabe957..dbed0f0a7f 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1600,6 +1600,17 @@ static int decode_update_thread_context(AVCodecContext *dst, memset(&h->me, 0, sizeof(h->me)); h->avctx = dst; h->DPB = 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; if (h1->context_initialized) { h->context_initialized = 0; |