RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-18 21:07:01 +00:00
Code Issues Projects Releases Wiki Activity

ff_mpeg_update_thread_context: assert context unequality

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-18 02:56:29 +01:00
parent f48cddfe4c
commit 1a947dfa83
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mpegvideo.c
View File

@ -536,6 +536,8 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst,
if (dst == src) if (dst == src)
return 0; return 0;
av_assert0(s != s1);
// FIXME can parameters change on I-frames? // FIXME can parameters change on I-frames?
// in that case dst may need a reinit // in that case dst may need a reinit
if (!s->context_initialized) { if (!s->context_initialized) {
@ -570,6 +572,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst,
s->picture_number = s1->picture_number; s->picture_number = s1->picture_number;
s->input_picture_number = s1->input_picture_number; s->input_picture_number = s1->input_picture_number;
av_assert0(!s->picture || s->picture != s1->picture);
memcpy(s->picture, s1->picture, s1->picture_count * sizeof(Picture)); memcpy(s->picture, s1->picture, s1->picture_count * sizeof(Picture));
memcpy(&s->last_picture, &s1->last_picture, memcpy(&s->last_picture, &s1->last_picture,
(char *) &s1->last_picture_ptr - (char *) &s1->last_picture); (char *) &s1->last_picture_ptr - (char *) &s1->last_picture);