generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: Use mb itself as memcpy anchor and assert the other anchors position

Browse Source 
This makes the code more robust against reordering or fields.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-14 00:33:28 +01:00
parent faf8eca08d
commit 701e9b8254
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/h264.c
View File

@ -1251,9 +1251,10 @@ static int decode_update_thread_context(AVCodecContext *dst,
for (i = 0; i < MAX_PPS_COUNT; i++)
av_freep(h->pps_buffers + i);
// copy all fields after MpegEnc
// copy all fields after MpegEnc, except mb
memcpy(&h->s + 1, &h1->s + 1,
offsetof(H264Context, intra_gb) - sizeof(MpegEncContext));
offsetof(H264Context, mb) - sizeof(MpegEncContext));
av_assert0(&h->cabac == &h->mb_padding + 1);
memcpy(&h->cabac, &h1->cabac,
sizeof(H264Context) - offsetof(H264Context, cabac));
memset(h->sps_buffers, 0, sizeof(h->sps_buffers));