[FFmpeg-cvslog] mpeg4videodec: disable frame multithreading for GMC, its not implemented at all

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 12 22:38:54 2012 +0200| [5e885275f1eda3f0281747d9c78d072adb8bc940] | committer: Michael Niedermayer

mpeg4videodec: disable frame multithreading for GMC, its not implemented at all

This fixes race conditions in decoding MPEG-4 GMC files

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

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

 libavcodec/mpegvideo.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index f4403ca..2fe2c91 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -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: