mpeg4videodec: disable frame multithreading for GMC, its not implemented at all
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 20:38:54 +0000 (22:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 20:53:22 +0000 (22:53 +0200)
This fixes race conditions in decoding MPEG-4 GMC files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c

index f4403ca..2fe2c91 100644 (file)
@@ -2344,7 +2344,7 @@ int ff_MPV_lowest_referenced_row(MpegEncContext *s, int dir)
     int my_max = INT_MIN, my_min = INT_MAX, qpel_shift = !s->quarter_sample;
     int my, off, i, mvs;
 
-    if (s->picture_structure != PICT_FRAME) goto unhandled;
+    if (s->picture_structure != PICT_FRAME || s->mcsel) goto unhandled;
 
     switch (s->mv_type) {
         case MV_TYPE_16X16: