diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:40:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:40:05 +0200 |
| commit | 944ad46182483ff52573ec3c827c86058b225d16 (patch) | |
| tree | beebcb4fcaa8cde85b9242000e8fa57d9f1cf64e /libavcodec | |
| parent | 3bc3c78a59d3ab2e62970e6a6531a93bb1b3b15c (diff) | |
| parent | e8cafd2773bc56455c8816593cbd9368f2d69a80 (diff) | |
| download | ffmpeg-944ad46182483ff52573ec3c827c86058b225d16.tar.gz | |
Merge commit 'e8cafd2773bc56455c8816593cbd9368f2d69a80'
* commit 'e8cafd2773bc56455c8816593cbd9368f2d69a80':
h264: Clear the mb members via memset instead of using dsputil
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 929889043c..3b3bfac026 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1676,6 +1676,10 @@ static int decode_update_thread_context(AVCodecContext *dst, memset(&h->er, 0, sizeof(h->er)); memset(&h->me, 0, sizeof(h->me)); + memset(&h->mb, 0, sizeof(h->mb)); + memset(&h->mb_luma_dc, 0, sizeof(h->mb_luma_dc)); + memset(&h->mb_padding, 0, sizeof(h->mb_padding)); + h->avctx = dst; h->DPB = NULL; h->qscale_table_pool = NULL; |