]> git.sesse.net Git - ffmpeg/commitdiff
ff_mpeg_update_thread_context: assert context unequality
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Nov 2012 01:56:29 +0000 (02:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Nov 2012 15:47:29 +0000 (16:47 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c

index f496e830a275632bf3944297781188b11f506bc5..885226ac6101a2d3d066788affc8afbb1a0b93ab 100644 (file)
@@ -536,6 +536,8 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst,
     if (dst == src)
         return 0;
 
+    av_assert0(s != s1);
+
     // FIXME can parameters change on I-frames?
     // in that case dst may need a reinit
     if (!s->context_initialized) {
@@ -570,6 +572,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst,
     s->picture_number       = s1->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->last_picture, &s1->last_picture,
            (char *) &s1->last_picture_ptr - (char *) &s1->last_picture);