[FFmpeg-cvslog] ff_mpeg_update_thread_context: assert context unequality

Michael Niedermayer git at videolan.org
Sun Nov 18 16:48:13 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 18 02:56:29 2012 +0100| [1a947dfa8347b3b1fe0f5bd699a10fe3dfe0ff50] | committer: Michael Niedermayer

ff_mpeg_update_thread_context: assert context unequality

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a947dfa8347b3b1fe0f5bd699a10fe3dfe0ff50
---

 libavcodec/mpegvideo.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index f496e83..885226a 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -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);



More information about the ffmpeg-cvslog mailing list